|
diff --git a/html.c b/html.c index 24a03a5..5b07aa0 100644 --- a/ html.c+++ b/ html.c |
|
@@ -133,82 +133,82 @@ void html_ntxt(int len, const char *txt) |
133 | html("..."); |
133 | html("..."); |
134 | } |
134 | } |
135 | |
135 | |
136 | void html_attr(const char *txt) |
136 | void html_attr(const char *txt) |
137 | { |
137 | { |
138 | const char *t = txt; |
138 | const char *t = txt; |
139 | while(t && *t){ |
139 | while(t && *t){ |
140 | int c = *t; |
140 | int c = *t; |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') { |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') { |
142 | html_raw(txt, t - txt); |
142 | html_raw(txt, t - txt); |
143 | if (c=='>') |
143 | if (c=='>') |
144 | html(">"); |
144 | html(">"); |
145 | else if (c=='<') |
145 | else if (c=='<') |
146 | html("<"); |
146 | html("<"); |
147 | else if (c=='\'') |
147 | else if (c=='\'') |
148 | html("'"); |
148 | html("'"); |
149 | else if (c=='"') |
149 | else if (c=='"') |
150 | html("""); |
150 | html("""); |
151 | else if (c=='&') |
151 | else if (c=='&') |
152 | html("&"); |
152 | html("&"); |
153 | txt = t+1; |
153 | txt = t+1; |
154 | } |
154 | } |
155 | t++; |
155 | t++; |
156 | } |
156 | } |
157 | if (t!=txt) |
157 | if (t!=txt) |
158 | html(txt); |
158 | html(txt); |
159 | } |
159 | } |
160 | |
160 | |
161 | void html_url_path(const char *txt) |
161 | void html_url_path(const char *txt) |
162 | { |
162 | { |
163 | const char *t = txt; |
163 | const char *t = txt; |
164 | while(t && *t){ |
164 | while(t && *t){ |
165 | int c = *t; |
165 | unsigned char c = *t; |
166 | const char *e = url_escape_table[c]; |
166 | const char *e = url_escape_table[c]; |
167 | if (e && c!='+' && c!='&') { |
167 | if (e && c!='+' && c!='&') { |
168 | html_raw(txt, t - txt); |
168 | html_raw(txt, t - txt); |
169 | html(e); |
169 | html(e); |
170 | txt = t+1; |
170 | txt = t+1; |
171 | } |
171 | } |
172 | t++; |
172 | t++; |
173 | } |
173 | } |
174 | if (t!=txt) |
174 | if (t!=txt) |
175 | html(txt); |
175 | html(txt); |
176 | } |
176 | } |
177 | |
177 | |
178 | void html_url_arg(const char *txt) |
178 | void html_url_arg(const char *txt) |
179 | { |
179 | { |
180 | const char *t = txt; |
180 | const char *t = txt; |
181 | while(t && *t){ |
181 | while(t && *t){ |
182 | int c = *t; |
182 | unsigned char c = *t; |
183 | const char *e = url_escape_table[c]; |
183 | const char *e = url_escape_table[c]; |
184 | if (c == ' ') |
184 | if (c == ' ') |
185 | e = "+"; |
185 | e = "+"; |
186 | if (e) { |
186 | if (e) { |
187 | html_raw(txt, t - txt); |
187 | html_raw(txt, t - txt); |
188 | html(e); |
188 | html(e); |
189 | txt = t+1; |
189 | txt = t+1; |
190 | } |
190 | } |
191 | t++; |
191 | t++; |
192 | } |
192 | } |
193 | if (t!=txt) |
193 | if (t!=txt) |
194 | html(txt); |
194 | html(txt); |
195 | } |
195 | } |
196 | |
196 | |
197 | void html_hidden(const char *name, const char *value) |
197 | void html_hidden(const char *name, const char *value) |
198 | { |
198 | { |
199 | html("<input type='hidden' name='"); |
199 | html("<input type='hidden' name='"); |
200 | html_attr(name); |
200 | html_attr(name); |
201 | html("' value='"); |
201 | html("' value='"); |
202 | html_attr(value); |
202 | html_attr(value); |
203 | html("'/>"); |
203 | html("'/>"); |
204 | } |
204 | } |
205 | |
205 | |
206 | void html_option(const char *value, const char *text, const char *selected_value) |
206 | void html_option(const char *value, const char *text, const char *selected_value) |
207 | { |
207 | { |
208 | html("<option value='"); |
208 | html("<option value='"); |
209 | html_attr(value); |
209 | html_attr(value); |
210 | html("'"); |
210 | html("'"); |
211 | if (selected_value && !strcmp(selected_value, value)) |
211 | if (selected_value && !strcmp(selected_value, value)) |
212 | html(" selected='selected'"); |
212 | html(" selected='selected'"); |
213 | html(">"); |
213 | html(">"); |
214 | html_txt(text); |
214 | html_txt(text); |
|