|
diff --git a/html.c b/html.c index 167127f..d7d9fd7 100644 --- a/ html.c+++ b/ html.c |
|
@@ -67,128 +67,144 @@ void html_txt(char *txt) |
67 | { |
67 | { |
68 | char *t = txt; |
68 | char *t = txt; |
69 | while(t && *t){ |
69 | while(t && *t){ |
70 | int c = *t; |
70 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { |
71 | if (c=='<' || c=='>' || c=='&') { |
72 | write(htmlfd, txt, t - txt); |
72 | write(htmlfd, txt, t - txt); |
73 | if (c=='>') |
73 | if (c=='>') |
74 | html(">"); |
74 | html(">"); |
75 | else if (c=='<') |
75 | else if (c=='<') |
76 | html("<"); |
76 | html("<"); |
77 | else if (c=='&') |
77 | else if (c=='&') |
78 | html("&"); |
78 | html("&"); |
79 | txt = t+1; |
79 | txt = t+1; |
80 | } |
80 | } |
81 | t++; |
81 | t++; |
82 | } |
82 | } |
83 | if (t!=txt) |
83 | if (t!=txt) |
84 | html(txt); |
84 | html(txt); |
85 | } |
85 | } |
86 | |
86 | |
87 | void html_ntxt(int len, char *txt) |
87 | void html_ntxt(int len, char *txt) |
88 | { |
88 | { |
89 | char *t = txt; |
89 | char *t = txt; |
90 | while(t && *t && len--){ |
90 | while(t && *t && len--){ |
91 | int c = *t; |
91 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { |
92 | if (c=='<' || c=='>' || c=='&') { |
93 | write(htmlfd, txt, t - txt); |
93 | write(htmlfd, txt, t - txt); |
94 | if (c=='>') |
94 | if (c=='>') |
95 | html(">"); |
95 | html(">"); |
96 | else if (c=='<') |
96 | else if (c=='<') |
97 | html("<"); |
97 | html("<"); |
98 | else if (c=='&') |
98 | else if (c=='&') |
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'"); |
163 | html(">"); |
179 | html(">"); |
164 | html_txt(text); |
180 | html_txt(text); |
165 | html("</option>\n"); |
181 | html("</option>\n"); |
166 | } |
182 | } |
167 | |
183 | |
168 | void html_link_open(char *url, char *title, char *class) |
184 | void html_link_open(char *url, char *title, char *class) |
169 | { |
185 | { |
170 | html("<a href='"); |
186 | html("<a href='"); |
171 | html_attr(url); |
187 | html_attr(url); |
172 | if (title) { |
188 | if (title) { |
173 | html("' title='"); |
189 | html("' title='"); |
174 | html_attr(title); |
190 | html_attr(title); |
175 | } |
191 | } |
176 | if (class) { |
192 | if (class) { |
177 | html("' class='"); |
193 | html("' class='"); |
178 | html_attr(class); |
194 | html_attr(class); |
179 | } |
195 | } |
180 | html("'>"); |
196 | html("'>"); |
181 | } |
197 | } |
182 | |
198 | |
183 | void html_link_close(void) |
199 | void html_link_close(void) |
184 | { |
200 | { |
185 | html("</a>"); |
201 | html("</a>"); |
186 | } |
202 | } |
187 | |
203 | |
188 | void html_fileperm(unsigned short mode) |
204 | void html_fileperm(unsigned short mode) |
189 | { |
205 | { |
190 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
206 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
191 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
207 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
192 | } |
208 | } |
193 | |
209 | |
194 | int html_include(const char *filename) |
210 | int html_include(const char *filename) |
|