From b2dc329d437603e525609b101ecced7f0c5b19cd Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 1 Oct 2004 22:24:44 +0000 Subject: r2771: Second (and last) part of Swat-i18n-Patch from Björn Jacke MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "Do not use display charset for swat output. In HTML we do not care about the "locale charmap" because HTML code is UTF-8 only now. Additionally take care that we convert files from statuspage from unix charset to UTF-8. Thus we have correct HTML output under all circumstances. We now also convert the share names correctly from unix encoding to web encoding and vice vera. " Guenther (This used to be commit 6d9f77c2bb95db4939b8ef375e22b188168b70ab) --- source3/web/swat.c | 457 +++++++++++++++++++++++++++-------------------------- 1 file changed, 230 insertions(+), 227 deletions(-) (limited to 'source3/web/swat.c') diff --git a/source3/web/swat.c b/source3/web/swat.c index ed53d0d712..40f9f05991 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -115,8 +115,8 @@ static int include_html(const char *fname) fd = web_open(fname, O_RDONLY, 0); if (fd == -1) { - d_printf(_("ERROR: Can't open %s"), fname); - d_printf("\n"); + printf(_("ERROR: Can't open %s"), fname); + printf("\n"); return 0; } @@ -134,13 +134,13 @@ static int include_html(const char *fname) static void print_header(void) { if (!cgi_waspost()) { - d_printf("Expires: 0\r\n"); + printf("Expires: 0\r\n"); } - d_printf("Content-type: text/html\r\n\r\n"); + printf("Content-type: text/html\r\n\r\n"); if (!include_html("include/header.html")) { - d_printf("\n"); - d_printf("\n\nSamba Web Administration Tool\n\n\n\n"); + printf("\n"); + printf("\n\nSamba Web Administration Tool\n\n\n\n"); } } @@ -182,7 +182,7 @@ static const char* get_parm_translated( static void print_footer(void) { if (!include_html("include/footer.html")) { - d_printf("\n\n\n"); + printf("\n\n\n"); } } @@ -198,106 +198,106 @@ static void show_parameter(int snum, struct parm_struct *parm) ptr = lp_local_ptr(snum, ptr); } - d_printf("%s", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label)); + printf("%s", get_parm_translated(stripspaceupper(parm->label), _("Help"), parm->label)); switch (parm->type) { case P_CHAR: - d_printf("", + printf("", make_parm_name(parm->label), *(char *)ptr); - d_printf("", + printf("", _("Set Default"), make_parm_name(parm->label),(char)(parm->def.cvalue)); break; case P_LIST: - d_printf("label)); if ((char ***)ptr && *(char ***)ptr && **(char ***)ptr) { char **list = *(char ***)ptr; for (;*list;list++) { /* enclose in quotes if the string contains a space */ if ( strchr_m(*list, ' ') ) - d_printf("\'%s\'%s", *list, ((*(list+1))?", ":"")); + printf("\'%s\'%s", *list, ((*(list+1))?", ":"")); else - d_printf("%s%s", *list, ((*(list+1))?", ":"")); + printf("%s%s", *list, ((*(list+1))?", ":"")); } } - d_printf("\">"); - d_printf(""); + printf("label)); if (parm->def.lvalue) { char **list = (char **)(parm->def.lvalue); for (; *list; list++) { /* enclose in quotes if the string contains a space */ if ( strchr_m(*list, ' ') ) - d_printf("\'%s\'%s", *list, ((*(list+1))?", ":"")); + printf("\'%s\'%s", *list, ((*(list+1))?", ":"")); else - d_printf("%s%s", *list, ((*(list+1))?", ":"")); + printf("%s%s", *list, ((*(list+1))?", ":"")); } } - d_printf("\'\">"); + printf("\'\">"); break; case P_STRING: case P_USTRING: - d_printf("", + printf("", make_parm_name(parm->label), *(char **)ptr); - d_printf("", + printf("", _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); break; case P_GSTRING: case P_UGSTRING: - d_printf("", + printf("", make_parm_name(parm->label), (char *)ptr); - d_printf("", + printf("", _("Set Default"), make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue))); break; case P_BOOL: - d_printf(""); - d_printf("", + printf(""); + printf("", _("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?0:1); break; case P_BOOLREV: - d_printf(""); - d_printf("", + printf(""); + printf("", _("Set Default"), make_parm_name(parm->label),(BOOL)(parm->def.bvalue)?1:0); break; case P_INTEGER: - d_printf("", make_parm_name(parm->label), *(int *)ptr); - d_printf("", + printf("", make_parm_name(parm->label), *(int *)ptr); + printf("", _("Set Default"), make_parm_name(parm->label),(int)(parm->def.ivalue)); break; case P_OCTAL: - d_printf("", make_parm_name(parm->label), octal_string(*(int *)ptr)); - d_printf("", + printf("", make_parm_name(parm->label), octal_string(*(int *)ptr)); + printf("", _("Set Default"), make_parm_name(parm->label), octal_string((int)(parm->def.ivalue))); break; case P_ENUM: - d_printf("",make_parm_name(parm->label)); for (i=0;parm->enum_list[i].name;i++) { if (i == 0 || parm->enum_list[i].value != parm->enum_list[i-1].value) { - d_printf("