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

Fixed bug in help file redirection

Browse Source 
SVN revision: 1786
This commit is contained in:
Stefan Ritt 2007-02-05 12:21:31 +00:00
parent b8de0a3909
commit 033a720ab8
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/elogd.c
View File

@ -22803,7 +22803,7 @@ void interprete(char *lbook, char *path)
{ {
int status, i, j, n, index, lb_index, message_id; int status, i, j, n, index, lb_index, message_id;
char exp[80], list[1000], section[256], str[NAME_LENGTH], str2[NAME_LENGTH], edit_id[80], char exp[80], list[1000], section[256], str[NAME_LENGTH], str2[NAME_LENGTH], edit_id[80],
enc_pwd[80], file_name[256], command[256], ref[256], enc_path[256], dec_path[256], uname[80], enc_pwd[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80],
logbook[256], logbook_enc[256], *experiment, group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], logbook[256], logbook_enc[256], *experiment, group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH],
full_name[256]; full_name[256];
BOOL global; BOOL global;
@ -23344,12 +23344,26 @@ void interprete(char *lbook, char *path)
if (strieq(command, loc("Help"))) { if (strieq(command, loc("Help"))) {
if (getcfg(lbs->name, "Help URL", str, sizeof(str))) { if (getcfg(lbs->name, "Help URL", str, sizeof(str))) {
/* if file is given, add '/' to make absolute path */
if (strchr(str, '/') == NULL) /* if URL is given, redirect */
sprintf(ref, "/%s", str); if (strstr(str, "http://")) {
else redirect(lbs, str);
strcpy(ref, str); return;
redirect(lbs, ref); }
/* send file from resource directory */
strlcpy(file_name, resource_dir, sizeof(file_name));
strlcat(file_name, "resources", sizeof(file_name));
strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name));
strlcat(file_name, str, sizeof(file_name));
f = fopen(file_name, "r");
if (f == NULL) {
sprintf(str, "Cannot find file \"%s\"", file_name);
show_error(str);
} else {
fclose(f);
send_file_direct(file_name);
}
return; return;
} }