Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remove "back" button from error display (NS4.7 does not support it)

Browse Source 
- Fixed wrong URL in email notification
- Submission of new messages possible even if cookie expired during editing


SVN revision: 15
This commit is contained in:
Stefan Ritt 2002-01-15 10:23:59 +00:00
parent 5cf5f3de79
commit 8aee2d8be3
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
elogd.c
View File

@ -6,6 +6,11 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.6 2002/01/15 10:23:59 midas
- Remove "back" button from error display (NS4.7 does not support it)
- Fixed wrong URL in email notification
- Submission of new messages possible even if cookie expired during editing
Revision 1.5 2002/01/14 13:05:41 midas Revision 1.5 2002/01/14 13:05:41 midas
- Check for JavaScript in error display - Check for JavaScript in error display
- Improved decoding of POST message (needed for lynx) - Improved decoding of POST message (needed for lynx)
@ -2791,6 +2796,7 @@ void show_error(char *error)
rsprintf("<tr><td bgcolor=%s align=center>", gt("Cell BGColor")); rsprintf("<tr><td bgcolor=%s align=center>", gt("Cell BGColor"));
/*
rsprintf("<script language=\"javascript\" type=\"text/javascript\">\n"); rsprintf("<script language=\"javascript\" type=\"text/javascript\">\n");
rsprintf("if (!navigator.javaEnabled()) {\n"); rsprintf("if (!navigator.javaEnabled()) {\n");
rsprintf(" document.write(\"%s\")\n", loc("Please use your browser's back button to go back")); rsprintf(" document.write(\"%s\")\n", loc("Please use your browser's back button to go back"));
@ -2800,15 +2806,12 @@ void show_error(char *error)
rsprintf("</script>\n"); rsprintf("</script>\n");
rsprintf("<noscript>\n"); rsprintf("<noscript>\n");
rsprintf("%s\n", loc("Please use your browser's back button to go back"));
rsprintf("</noscript>\n");
/*
rsprintf("<button type=button onClick=history.back()>%s</button>\n", loc("Back"));
*/ */
rsprintf("%s\n", loc("Please use your browser's back button to go back"));
/* /*
rsprintf("<input type=submit value=\"%s\">", loc("Back")); rsprintf("</noscript>\n");
*/ */
rsprintf("</td></tr>\n</table></td></tr></table>\n"); rsprintf("</td></tr>\n</table></td></tr></table>\n");
@ -5190,7 +5193,7 @@ int i, j, n, missing, first, index, n_attr, n_mail, suppress, status;
strcpy(subject, "New ELOG entry"); strcpy(subject, "New ELOG entry");
sprintf(mail_text+strlen(mail_text), "\r\n%s URL : %s%s/%s\r\n", sprintf(mail_text+strlen(mail_text), "\r\n%s URL : %s%s/%s\r\n",
elogd_full_url, loc("Logbook"), logbook_enc, tag); loc("Logbook"), elogd_full_url, logbook_enc, tag);
if (getcfg(logbook, "Email message body", str) && if (getcfg(logbook, "Email message body", str) &&
atoi(str) == 1) atoi(str) == 1)
@ -6752,16 +6755,18 @@ struct tm *gmt;
/*---- show ELog page --------------------------------------------*/ /*---- show ELog page --------------------------------------------*/
/* if password file given, check password and user name */
if (getcfg(logbook, "Password file", str)) if (getcfg(logbook, "Password file", str))
{ {
if (!check_user_password(logbook, getparam("unm"), getparam("upwd"), path)) /* don't check password for submit, since cookie might have been expired during editing */
return; if (!equal_ustring(command, loc("Submit")))
if (!check_user_password(logbook, getparam("unm"), getparam("upwd"), path))
return;
} }
if (equal_ustring(command, loc("New")) || if (equal_ustring(command, loc("New")) ||
equal_ustring(command, loc("Edit")) || equal_ustring(command, loc("Edit")) ||
equal_ustring(command, loc("Reply")) || equal_ustring(command, loc("Reply")) ||
equal_ustring(command, loc("Submit")) ||
equal_ustring(command, loc("Delete"))) equal_ustring(command, loc("Delete")))
{ {
sprintf(str, "%s?cmd=%s", path, command); sprintf(str, "%s?cmd=%s", path, command);