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

Check for .jpg & co files in resource dir, then in themes dir

Browse Source 
SVN revision: 538
This commit is contained in:
Stefan Ritt 2003-05-20 00:11:51 +00:00
parent d2c42b8ff1
commit 6ca8c70fa1
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
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.111 2003/05/20 00:11:51 midas
Check for .jpg & co files in resource dir, then in themes dir
Revision 1.110 2003/05/17 16:00:31 midas Revision 1.110 2003/05/17 16:00:31 midas
Remove message lock on 'Back' button; on config user page, don't go back after 'Save' Remove message lock on 'Back' button; on config user page, don't go back after 'Save'
@ -4686,6 +4689,21 @@ BOOL global;
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
int exist_file(char *file_name)
{
int fh;
fh = open(file_name, O_RDONLY | O_BINARY);
if (fh > 0)
{
close(fh);
return 1;
}
return 0;
}
/*------------------------------------------------------------------*/
void send_file_direct(char *file_name) void send_file_direct(char *file_name)
{ {
int fh, i, length, delta; int fh, i, length, delta;
@ -12940,19 +12958,28 @@ int net_buffer_size;
strstr(logbook, ".jpg") || strstr(logbook, ".png") || strstr(logbook, ".jpg") || strstr(logbook, ".png") ||
strstr(logbook, ".htm") || strstr(logbook, ".css")) strstr(logbook, ".htm") || strstr(logbook, ".css"))
{ {
/* serve file directly from themes directory */ /* check if file in resource directory */
strlcpy(str, resource_dir, sizeof(str)); 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));
strlcat(str, DIR_SEPARATOR_STR, sizeof(str));
strlcat(str, logbook, sizeof(str)); strlcat(str, logbook, sizeof(str));
send_file_direct(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));
strlcat(str, DIR_SEPARATOR_STR, sizeof(str));
strlcat(str, logbook, sizeof(str));
send_file_direct(str);
}
send(_sock, return_buffer, return_length, 0); send(_sock, return_buffer, return_length, 0);
if (verbose) if (verbose)