author | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 15:16:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 15:16:48 (UTC) |
commit | c6bea0375aa7898ea3229483741944303740801e (patch) (unidiff) | |
tree | 249000a4b85dbab2a7067042f9d835bc0a5e5f8f /html.c | |
parent | 20c895f6889a66d7cf43c67a7c22df6ef324ed5d (diff) | |
parent | 49ecbbddf0659c6409befcfe8989f92196133cda (diff) | |
download | cgit-c6bea0375aa7898ea3229483741944303740801e.zip cgit-c6bea0375aa7898ea3229483741944303740801e.tar.gz cgit-c6bea0375aa7898ea3229483741944303740801e.tar.bz2 |
Merge branch 'lh/escape-urls'
* lh/escape-urls:
ui-repolist + ui-shared: Use cgit_summary_link()
ui-shared.c: add cgit_summary_link()
ui-shared.c: use html_url_path() in repolink()
html.c: add html_url_path
-rw-r--r-- | html.c | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -107,48 +107,64 @@ void html_ntxt(int len, char *txt) | |||
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 | } |