diff options
| -rw-r--r-- | source3/web/cgi.c | 18 | ||||
| -rw-r--r-- | source3/web/swat.c | 9 |
2 files changed, 8 insertions, 19 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 9804f93adf..97dac86668 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -622,8 +622,10 @@ void cgi_setup(char *rootdir, int auth_required) *p = 0; } - if (strstr(url+1,"..")==0 && file_exist(url+1, NULL)) { - cgi_download(url+1); + string_sub(url, "/swat/", ""); + + if (strstr(url,"..")==0 && file_exist(url, NULL)) { + cgi_download(url); } printf("HTTP/1.1 200 OK\r\nConnection: close\r\n"); @@ -645,18 +647,6 @@ char *cgi_baseurl(void) } /*************************************************************************** -return the root URL for images etc - ***************************************************************************/ -char *cgi_rooturl(void) -{ - if (baseurl) { - return "/"; - } - return "/swat/"; -} - - -/*************************************************************************** return the current pages path info ***************************************************************************/ char *cgi_pathinfo(void) diff --git a/source3/web/swat.c b/source3/web/swat.c index 504552ec40..2665df5d1b 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -107,7 +107,7 @@ static void print_header(void) if (!include_html("include/header.html")) { printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n"); - printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"%simages/background.jpg\">\n\n", cgi_rooturl()); + printf("<HTML>\n<HEAD>\n<TITLE>Samba Web Administration Tool</TITLE>\n</HEAD>\n<BODY background=\"/swat/images/background.jpg\">\n\n"); } } @@ -132,8 +132,8 @@ static void show_parameter(int snum, struct parm_struct *parm) ptr = lp_local_ptr(snum, ptr); } - printf("<tr><td><A HREF=\"%shelp/parameters.html#%s\">?</A> %s</td><td>", - cgi_rooturl(), parm->label, parm->label); + printf("<tr><td><A HREF=\"/swat/help/parameters.html#%s\">?</A> %s</td><td>", + parm->label, parm->label); switch (parm->type) { case P_CHAR: @@ -355,10 +355,9 @@ static void load_config(void) /* spit out the html for a link with an image */ static void image_link(char *name,char *hlink, char *src, int width, int height) { - printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"%s%s\" alt=\"%s\"></A>\n", + printf("<A HREF=\"%s/%s\"><img width=%d height=%d src=\"/swat/%s\" alt=\"%s\"></A>\n", cgi_baseurl(), hlink, width, height, - cgi_rooturl(), src, name); } |