From 43d8311eae3f264b62deff271487f6064be132d4 Mon Sep 17 00:00:00 2001
From: Stefan Ritt <stefan.ritt@psi.ch>
Date: Sat, 27 Mar 2004 14:33:59 +0000
Subject: [PATCH] Implemeted first version of favicon

SVN revision: 859
---
 src/elogd.c                |  13 ++++++++++---
 themes/default/favicon.ico | Bin 0 -> 1334 bytes
 themes/default/favicon.png | Bin 0 -> 494 bytes
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100755 themes/default/favicon.ico
 create mode 100755 themes/default/favicon.png

diff --git a/src/elogd.c b/src/elogd.c
index d209c386..1a3d98f0 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
    Contents:     Web server program for Electronic Logbook ELOG
   
    $Log$
+   Revision 1.316  2004/03/27 14:33:59  midas
+   Implemeted first version of favicon
+
    Revision 1.315  2004/03/26 08:28:29  midas
    Version 2.5.2
 
@@ -684,6 +687,7 @@ struct {
    ".JPEG", "image/jpeg"}, {
    ".GIF", "image/gif"}, {
    ".PNG", "image/png"}, {
+   ".ICO", "text/plain"}, {
    ".PS", "application/postscript"}, {
    ".EPS", "application/postscript"}, {
    ".HTML", "text/html"}, {
@@ -5204,6 +5208,9 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head)
 
    rsprintf("<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n", css);
 
+   rsprintf("<link rel=\"shortcut icon\" href=\"favicon.ico\">\n");
+   rsprintf("<link rel=\"icon\" href=\"favicon.png\" type=\"image/png\">\n");
+
    if (close_head)
       rsprintf("</head>\n");
 }
@@ -16355,7 +16362,7 @@ void interprete(char *lbook, char *path)
 
    if ((strlen(pfile) > 13 && pfile[6] == '_' && pfile[13] == '_')
        || (strlen(pfile) > 13 && pfile[6] == '_' && pfile[13] == '/')
-       || strstr(pfile, ".gif")
+       || strstr(pfile, ".gif") || strstr(pfile, ".ico")
        || strstr(pfile, ".jpg") || strstr(pfile, ".jpeg")
        || strstr(pfile, ".png") || strstr(pfile, ".css")
        || strstr(pfile, ".js")) {
@@ -17607,8 +17614,8 @@ void server_loop(int tcp_port, int daemon)
          }
 
          if (strstr(logbook, ".gif") || strstr(logbook, ".jpg") ||
-             strstr(logbook, ".jpg") || strstr(logbook, ".png")
-             || strstr(logbook, ".htm")
+             strstr(logbook, ".jpg") || strstr(logbook, ".png") ||
+             strstr(logbook, ".ico") || strstr(logbook, ".htm")
              || strstr(logbook, ".css")) {
             /* check if file in resource directory */
             strlcpy(str, resource_dir, sizeof(str));
diff --git a/themes/default/favicon.ico b/themes/default/favicon.ico
new file mode 100755
index 0000000000000000000000000000000000000000..ee85485c2dd6594a5f9aebc8778ca6aa82237ac9
GIT binary patch
literal 1334
zcmeH@eM?hu6vw~IEoWLfvozbare=D3a%xkXtNCmf{4f6yZK2{?B94R<6dx!bW?H$2
zbOS+bdKF)QIHidTBFLu~;2-mSD0qJNUJ&1cc;Lf1pWp8s4xEa5lLk_l)Ics(NeU`x
z<qs7Q$&isBfRUy;xLV#|vaJDLM<d*hW_TQL2^%~eHvH_gVMgK|<rd6#w!z=k3cs@z
zbI$je``Av{G2d;+!lw`T)zg7sPZyR5vDb;!zHY3I_G5i)0HJZlATflEi6N|y4<q#T
zGd74#;`ihigujho`-cnL(=J5Zj0yZ9{`#iy&-Wd>Gt>C*cVmaxWjR2Z*rR%%A-R{_
zL+-&|fbe^%CIal;hXZ;$p!zU4kEj?#beRwrDKFxPh>9YPR)WM5j>BObZ*Ad(xQxpS
zT(}De=L5wr%Pbc23rnflQf7WEAnPv2rRzB^Td&XH?g-GSuf}N98l6tMgaF9%Dk+2c
z6>Z$LxEm0Xse^eu&jP}2p3h|-n{Yjm`AwdGsLbDEo+A6}TMu#!%+uulx}^ICgCP?_
zsxmJvWZQW@kLHz-mXJSxR%k59FEJGvpBkS$5>Rd}udS%8vQ|}EYpP$J^($ki+>)(Z

literal 0
HcmV?d00001

diff --git a/themes/default/favicon.png b/themes/default/favicon.png
new file mode 100755
index 0000000000000000000000000000000000000000..f6b6ddfd06e222916ad3fa54356fbabd8e02384e
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00007bV*G`2h;-_
z4HqTDoSjtw000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP0004fNkl<Z
zc-oaxJ4*vW5T4n)iy9J?AR&q;rVt-s(kW^u77AKeYJ!!OrH$ANBDSVe6dMUPf{215
zXyKz0t^5;$h+-0Ncbt3XxLD}G-ObH@-^@3&gHwfd_>bxQ6lRJ*00;t+6tTlUM1;s5
ze}NA)MOA6_bY*SA+xsiSI1H$Okl)PZ6l4=P!YL3)NlSW!)0?wjt51$jgny-!o+P%_
zrL_opb7$l7?y8aL5m@Qr$-dcPg3|%pSbpU8>46g+pO<|w)d?)J#b}Bd&5W<rs_}Rt
zNU3RhbV@E|ZhFD>uJ13xh>BII=MNEJ@2F%5g9I9=_a+B}xHH#ZDu5>Rf&P5steEd<
zh!8%$KA&G6op$W%x+Z){wP0Msx$!z-xwsNeTsqito%z|tV9;KL?sR6iyv_Ig4P2hc
zx$RV2d&&nzdoVk*HOq1pC})LSxkk*$q)l7BKt8aPf77kWlno-KP&mzzyGR^?1o9>c
kUP(kLl}8xr%fX-R2cFJ?{`Xw7`v3p{07*qoM6N<$f?s3SmjD0&

literal 0
HcmV?d00001