Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-12 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not display *.ps and *.pdf files inline

Browse Source 
SVN revision: 1063
This commit is contained in:
Stefan Ritt 2004-09-08 12:06:18 +00:00
parent 90ce5ddfce
commit 0e4ba7c687
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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.463 2004/09/08 12:06:18 midas
Do not display *.ps and *.pdf files inline
Revision 1.462 2004/09/08 10:18:37 midas Revision 1.462 2004/09/08 10:18:37 midas
Use rsput3 to display config page Use rsput3 to display config page
@ -5025,6 +5028,14 @@ int is_ascii(char *file_name)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
int is_image(char *att)
{
return strstr(att, ".GIF") || strstr(att, ".JPG") || strstr(att, ".JPEG") ||
strstr(att, ".PNG");
}
/*------------------------------------------------------------------*/
void strip_html(char *s) void strip_html(char *s)
{ {
char *p; char *p;
@ -13405,8 +13416,7 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
rsprintf("<a href=\"%s\">%s</a>&nbsp;&nbsp;&nbsp;&nbsp; ", ref, rsprintf("<a href=\"%s\">%s</a>&nbsp;&nbsp;&nbsp;&nbsp; ", ref,
attachment[index] + 14); attachment[index] + 14);
} else { } else {
if (strstr(str, ".GIF") || strstr(str, ".JPG") || strstr(str, ".JPEG") if (is_image(str)) {
|| strstr(str, ".PNG")) {
rsprintf rsprintf
("<tr><td colspan=%d class=\"attachment\">%s %d: <a href=\"%s\">%s</a>\n", ("<tr><td colspan=%d class=\"attachment\">%s %d: <a href=\"%s\">%s</a>\n",
colspan, loc("Attachment"), index + 1, ref, colspan, loc("Attachment"), index + 1, ref,
@ -17405,8 +17415,9 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
rsprintf("</span>\n"); rsprintf("</span>\n");
/* determine if displayed inline */ /* determine if displayed inline */
display_inline = (strstr(att, ".GIF") || strstr(att, ".JPG") || strstr(att, ".JPEG") display_inline = is_image(file_name) || is_ascii(file_name);
|| strstr(att, ".PNG") || is_ascii(file_name)); if (strstr(att, ".PS") || strstr(att, ".PDF"))
display_inline = 0;
if (display_inline) { if (display_inline) {
rsprintf("<span class=\"bytes\">"); rsprintf("<span class=\"bytes\">");
@ -17456,10 +17467,9 @@ void show_elog_entry(LOGBOOK * lbs, char *dec_path, char *command)
strlcat(file_name, attachment[index], sizeof(file_name)); strlcat(file_name, attachment[index], sizeof(file_name));
if ((!getcfg(lbs->name, "Show attachments", str, sizeof(str)) if ((!getcfg(lbs->name, "Show attachments", str, sizeof(str))
|| atoi(str) == 1) && !att_hide[index]) { || atoi(str) == 1) && !att_hide[index] && display_inline) {
if (strstr(att, ".GIF") || strstr(att, ".JPG") || strstr(att, ".JPEG") if (is_image(att)) {
|| strstr(att, ".PNG")) {
rsprintf("<tr><td class=\"messageframe\">\n"); rsprintf("<tr><td class=\"messageframe\">\n");
rsprintf("<a name=\"att%d\"></a>\n", index + 1); rsprintf("<a name=\"att%d\"></a>\n", index + 1);
rsprintf("<img src=\"%s\"></td></tr>", ref); rsprintf("<img src=\"%s\"></td></tr>", ref);