From 7b07680d3b1a302de8284df10658546b75da9887 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 1 Sep 1998 06:03:03 +0000 Subject: [PATCH 1/1] spruced up SWAT a bit - it now uses the new Samba logo at the top and a table to give it a little border (This used to be commit d35c6e80988d96049d4624b47ae9ea015edafc59) --- source3/web/swat.c | 48 ++++++++++++++++++++++----------------- swat/images/samba.gif | Bin 0 -> 3643 bytes swat/include/footer.html | 3 +++ swat/include/header.html | 10 ++++++++ 4 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 swat/images/samba.gif create mode 100644 swat/include/footer.html create mode 100644 swat/include/header.html diff --git a/source3/web/swat.c b/source3/web/swat.c index 3a56c822298..504552ec402 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -74,26 +74,9 @@ char *p = parmname; return parmname; } -/* start the page with standard stuff */ -static void print_header(void) -{ - if (!cgi_waspost()) { - printf("Expires: 0\r\n"); - } - printf("Content-type: text/html\r\n\r\n"); - printf("\n"); - printf("\n\nSamba Web Administration Tool\n\n\n\n", cgi_rooturl()); -} - - -/* finish off the page */ -static void print_footer(void) -{ - printf("\n\n\n"); -} /* include a lump of html in a page */ -static void include_html(char *fname) +static int include_html(char *fname) { FILE *f = fopen(fname,"r"); char buf[1024]; @@ -101,7 +84,7 @@ static void include_html(char *fname) if (!f) { printf("ERROR: Can't open %s\n", fname); - return; + return 0; } while (!feof(f)) { @@ -111,9 +94,34 @@ static void include_html(char *fname) } fclose(f); + return 1; +} + +/* start the page with standard stuff */ +static void print_header(void) +{ + if (!cgi_waspost()) { + printf("Expires: 0\r\n"); + } + printf("Content-type: text/html\r\n\r\n"); + + if (!include_html("include/header.html")) { + printf("\n"); + printf("\n\nSamba Web Administration Tool\n\n\n\n", cgi_rooturl()); + } } +/* finish off the page */ +static void print_footer(void) +{ + if (!include_html("include/footer.html")) { + printf("\n\n\n"); + } +} + + + /* display one editable parameter in a form */ static void show_parameter(int snum, struct parm_struct *parm) { @@ -358,8 +366,6 @@ static void image_link(char *name,char *hlink, char *src, int width, int height) with a title */ static void show_main_buttons(void) { - printf("

Samba Web Administration Tool

\n"); - image_link("Home", "", "images/home.gif", 50, 50); image_link("Globals", "globals", "images/globals.gif", 50, 50); image_link("Shares", "shares", "images/shares.gif", 50, 50); diff --git a/swat/images/samba.gif b/swat/images/samba.gif new file mode 100644 index 0000000000000000000000000000000000000000..3ec3d2195ffa47ee33011b5ab74f9ab7092fc093 GIT binary patch literal 3643 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 literal 0 HcmV?d00001 diff --git a/swat/include/footer.html b/swat/include/footer.html new file mode 100644 index 00000000000..7c3b483684c --- /dev/null +++ b/swat/include/footer.html @@ -0,0 +1,3 @@ + + + diff --git a/swat/include/header.html b/swat/include/header.html new file mode 100644 index 00000000000..b4f75529c09 --- /dev/null +++ b/swat/include/header.html @@ -0,0 +1,10 @@ + + + +Samba Web Administration Tool + + +
+[ Samba ]
+ +
-- 2.34.1