|
diff --git a/html.c b/html.c index 167127f..d7d9fd7 100644 --- a/ html.c+++ b/ html.c |
|
@@ -99,64 +99,80 @@ void html_ntxt(int len, char *txt) |
99 | html("&"); |
99 | html("&"); |
100 | txt = t+1; |
100 | txt = t+1; |
101 | } |
101 | } |
102 | t++; |
102 | t++; |
103 | } |
103 | } |
104 | if (t!=txt) |
104 | if (t!=txt) |
105 | write(htmlfd, txt, t - txt); |
105 | write(htmlfd, txt, t - txt); |
106 | if (len<0) |
106 | if (len<0) |
107 | html("..."); |
107 | html("..."); |
108 | } |
108 | } |
109 | |
109 | |
110 | void html_attr(char *txt) |
110 | void html_attr(char *txt) |
111 | { |
111 | { |
112 | char *t = txt; |
112 | char *t = txt; |
113 | while(t && *t){ |
113 | while(t && *t){ |
114 | int c = *t; |
114 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'') { |
115 | if (c=='<' || c=='>' || c=='\'') { |
116 | write(htmlfd, txt, t - txt); |
116 | write(htmlfd, txt, t - txt); |
117 | if (c=='>') |
117 | if (c=='>') |
118 | html(">"); |
118 | html(">"); |
119 | else if (c=='<') |
119 | else if (c=='<') |
120 | html("<"); |
120 | html("<"); |
121 | else if (c=='\'') |
121 | else if (c=='\'') |
122 | html(""e;"); |
122 | html(""e;"); |
123 | txt = t+1; |
123 | txt = t+1; |
124 | } |
124 | } |
125 | t++; |
125 | t++; |
126 | } |
126 | } |
127 | if (t!=txt) |
127 | if (t!=txt) |
128 | html(txt); |
128 | html(txt); |
129 | } |
129 | } |
130 | |
130 | |
| |
131 | void html_url_path(char *txt) |
| |
132 | { |
| |
133 | char *t = txt; |
| |
134 | while(t && *t){ |
| |
135 | int c = *t; |
| |
136 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
| |
137 | write(htmlfd, txt, t - txt); |
| |
138 | write(htmlfd, fmt("%%%2x", c), 3); |
| |
139 | txt = t+1; |
| |
140 | } |
| |
141 | t++; |
| |
142 | } |
| |
143 | if (t!=txt) |
| |
144 | html(txt); |
| |
145 | } |
| |
146 | |
131 | void html_url_arg(char *txt) |
147 | void html_url_arg(char *txt) |
132 | { |
148 | { |
133 | char *t = txt; |
149 | char *t = txt; |
134 | while(t && *t){ |
150 | while(t && *t){ |
135 | int c = *t; |
151 | int c = *t; |
136 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
152 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
137 | write(htmlfd, txt, t - txt); |
153 | write(htmlfd, txt, t - txt); |
138 | write(htmlfd, fmt("%%%2x", c), 3); |
154 | write(htmlfd, fmt("%%%2x", c), 3); |
139 | txt = t+1; |
155 | txt = t+1; |
140 | } |
156 | } |
141 | t++; |
157 | t++; |
142 | } |
158 | } |
143 | if (t!=txt) |
159 | if (t!=txt) |
144 | html(txt); |
160 | html(txt); |
145 | } |
161 | } |
146 | |
162 | |
147 | void html_hidden(char *name, char *value) |
163 | void html_hidden(char *name, char *value) |
148 | { |
164 | { |
149 | html("<input type='hidden' name='"); |
165 | html("<input type='hidden' name='"); |
150 | html_attr(name); |
166 | html_attr(name); |
151 | html("' value='"); |
167 | html("' value='"); |
152 | html_attr(value); |
168 | html_attr(value); |
153 | html("'/>"); |
169 | html("'/>"); |
154 | } |
170 | } |
155 | |
171 | |
156 | void html_option(char *value, char *text, char *selected_value) |
172 | void html_option(char *value, char *text, char *selected_value) |
157 | { |
173 | { |
158 | html("<option value='"); |
174 | html("<option value='"); |
159 | html_attr(value); |
175 | html_attr(value); |
160 | html("'"); |
176 | html("'"); |
161 | if (selected_value && !strcmp(selected_value, value)) |
177 | if (selected_value && !strcmp(selected_value, value)) |
162 | html(" selected='selected'"); |
178 | html(" selected='selected'"); |
|
|
diff --git a/html.h b/html.h index 038cf60..a55d4b2 100644 --- a/ html.h+++ b/ html.h |
|
@@ -1,23 +1,24 @@ |
1 | #ifndef HTML_H |
1 | #ifndef HTML_H |
2 | #define HTML_H |
2 | #define HTML_H |
3 | |
3 | |
4 | extern int htmlfd; |
4 | extern int htmlfd; |
5 | |
5 | |
6 | extern void html_raw(const char *txt, size_t size); |
6 | extern void html_raw(const char *txt, size_t size); |
7 | extern void html(const char *txt); |
7 | extern void html(const char *txt); |
8 | extern void htmlf(const char *format,...); |
8 | extern void htmlf(const char *format,...); |
9 | extern void html_status(int code, const char *msg, int more_headers); |
9 | extern void html_status(int code, const char *msg, int more_headers); |
10 | extern void html_txt(char *txt); |
10 | extern void html_txt(char *txt); |
11 | extern void html_ntxt(int len, char *txt); |
11 | extern void html_ntxt(int len, char *txt); |
12 | extern void html_attr(char *txt); |
12 | extern void html_attr(char *txt); |
| |
13 | extern void html_url_path(char *txt); |
13 | extern void html_url_arg(char *txt); |
14 | extern void html_url_arg(char *txt); |
14 | extern void html_hidden(char *name, char *value); |
15 | extern void html_hidden(char *name, char *value); |
15 | extern void html_option(char *value, char *text, char *selected_value); |
16 | extern void html_option(char *value, char *text, char *selected_value); |
16 | extern void html_link_open(char *url, char *title, char *class); |
17 | extern void html_link_open(char *url, char *title, char *class); |
17 | extern void html_link_close(void); |
18 | extern void html_link_close(void); |
18 | extern void html_fileperm(unsigned short mode); |
19 | extern void html_fileperm(unsigned short mode); |
19 | extern int html_include(const char *filename); |
20 | extern int html_include(const char *filename); |
20 | |
21 | |
21 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); |
22 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); |
22 | |
23 | |
23 | #endif /* HTML_H */ |
24 | #endif /* HTML_H */ |
|