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

Changed redirection to absolute location

Browse Source 
SVN revision: 867
This commit is contained in:
Stefan Ritt 2004-05-05 15:24:45 +00:00
parent e9228faac2
commit 2adc326176
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
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.320 2004/05/05 15:24:45 midas
Changed redirection to absolute location
Revision 1.319 2004/04/30 22:17:29 midas Revision 1.319 2004/04/30 22:17:29 midas
Implemented text body CSV import Implemented text body CSV import
@ -4854,42 +4857,40 @@ void set_location(LOGBOOK * lbs, char *rel_path)
else else
getcfg("global", "URL", str); getcfg("global", "URL", str);
if (str[0]) { if (!str[0]) {
/* absolute path */ /* assemble absolute path from host name and port */
if (str[strlen(str) - 1] != '/') sprintf(str, "http://%s", host_name);
strcat(str, "/"); if (tcp_port != 80)
sprintf(str+strlen(str), ":%d", tcp_port);
strcat(str, "/");
}
rsputs("Location: "); /* add trailing '/' if not present */
rsputs(str); if (str[strlen(str) - 1] != '/')
strcat(str, "/");
/* add top group if existing and not logbook */ rsputs("Location: ");
if (!lbs && getcfg_topgroup()) { rsputs(str);
rsputs(getcfg_topgroup());
/* add top group if existing and not logbook */
if (!lbs && getcfg_topgroup()) {
rsputs(getcfg_topgroup());
rsputs("/");
}
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("/");
} rsputs(rel_path);
} else
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); rsputs(rel_path);
} }
} }
@ -12228,6 +12229,8 @@ void show_elog_list(LOGBOOK * lbs, INT past_n, INT last_n, INT page_n, char *inf
else else
strlcat(_cmdline, "?reverse=0", sizeof(_cmdline)); strlcat(_cmdline, "?reverse=0", sizeof(_cmdline));
} }
if (_cmdline[strlen(_cmdline)-1] == '&')
_cmdline[strlen(_cmdline)-1] = 0;
redirect(lbs, _cmdline); redirect(lbs, _cmdline);
return; return;
} }
@ -17741,7 +17744,8 @@ void server_loop(int tcp_port, int daemon)
if (strstr(net_buffer, "POST") == NULL) { // fix for konqueror if (strstr(net_buffer, "POST") == NULL) { // fix for konqueror
if (logbook[0] && *p == ' ') { if (logbook[0] && *p == ' ') {
if (!strstr(logbook, ".css") && !strstr(logbook, ".htm") if (!strstr(logbook, ".css") && !strstr(logbook, ".htm")
&& !strstr(logbook, ".gif") && !strstr(logbook, ".jpg")) { && !strstr(logbook, ".gif") && !strstr(logbook, ".jpg")
&& !strstr(logbook, ".png")) {
sprintf(str, "%s/", logbook_enc); sprintf(str, "%s/", logbook_enc);
redirect(NULL, str); redirect(NULL, str);
goto redir; goto redir;
@ -18395,7 +18399,7 @@ int main(int argc, char *argv[])
if (tcp_port_cl != 0) if (tcp_port_cl != 0)
tcp_port = tcp_port_cl; tcp_port = tcp_port_cl;
else { else {
if (getcfg("global", "Port", str)) if (getcfg("global", "Port1", str))
tcp_port = atoi(str); tcp_port = atoi(str);
} }