← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libstruts1.2-java/lucid

« back to all changes in this revision

Viewing changes to src/share/org/apache/struts/taglib/html/SelectTag.java

  • Committer: Bazaar Package Importer
  • Author(s): Arnaud Vandyck
  • Date: 2006-04-24 12:14:23 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060424121423-naev53qigqgks0sa
Tags: 1.2.9-1
http://bugs.debian.org/360551
New upstream  release Fixes  three security  problems: CVE-2006-1546,
CVE-2006-1547,  CVE-2006-1548  (closes:  #360551),  thanks  to  Moritz
Muehlenhoff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/share/org/apache/struts/taglib/html/SelectTag.java
1
1
/*
2
 
 * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/SelectTag.java,v 1.22 2004/03/14 06:23:46 sraeburn Exp $
3
 
 * $Revision: 1.22 $
4
 
 * $Date: 2004/03/14 06:23:46 $
 
2
 * $Id: SelectTag.java 54929 2004-10-16 16:38:42Z germuska $ 
5
3
 *
6
4
 * Copyright 1999-2004 The Apache Software Foundation.
7
5
 * 
33
31
 * bean property specified by our attributes.  This tag must be nested
34
32
 * inside a form tag.
35
33
 *
36
 
 * @version $Revision: 1.22 $ $Date: 2004/03/14 06:23:46 $
 
34
 * @version $Rev: 54929 $ $Date: 2004-10-16 17:38:42 +0100 (Sat, 16 Oct 2004) $
37
35
 */
38
36
public class SelectTag extends BaseHandlerTag {
39
37
 
212
210
    protected String renderSelectStartElement() throws JspException {
213
211
        StringBuffer results = new StringBuffer("<select");
214
212
        
215
 
        results.append(" name=\"");
216
 
        // * @since Struts 1.1
217
 
        if (this.indexed) {
218
 
            prepareIndex(results, name);
219
 
        }
220
 
        results.append(property);
221
 
        results.append("\"");
222
 
        if (accesskey != null) {
223
 
            results.append(" accesskey=\"");
224
 
            results.append(accesskey);
225
 
            results.append("\"");
226
 
        }
 
213
        prepareAttribute(results, "name", prepareName());
 
214
        prepareAttribute(results, "accesskey", getAccesskey());
227
215
        if (multiple != null) {
228
216
            results.append(" multiple=\"multiple\"");
229
217
        }
230
 
        if (size != null) {
231
 
            results.append(" size=\"");
232
 
            results.append(size);
233
 
            results.append("\"");
234
 
        }
235
 
        if (tabindex != null) {
236
 
            results.append(" tabindex=\"");
237
 
            results.append(tabindex);
238
 
            results.append("\"");
239
 
        }
 
218
        prepareAttribute(results, "size", getSize());
 
219
        prepareAttribute(results, "tabindex", getTabindex());
240
220
        results.append(prepareEventHandlers());
241
221
        results.append(prepareStyles());
 
222
        prepareOtherAttributes(results);
242
223
        results.append(">");
243
224
        
244
225
        return results.toString();
334
315
    }
335
316
 
336
317
    /**
 
318
     * Prepare the name element
 
319
     * @return The element name.
 
320
     */
 
321
    protected String prepareName() throws JspException {
 
322
 
 
323
        if (property == null) {
 
324
            return null;
 
325
        }
 
326
 
 
327
        // * @since Struts 1.1
 
328
        if(indexed) {
 
329
            StringBuffer results = new StringBuffer();
 
330
            prepareIndex(results, name);
 
331
            results.append(property);
 
332
            return results.toString();
 
333
        }
 
334
 
 
335
        return property;
 
336
 
 
337
    }
 
338
 
 
339
    /**
337
340
     * Release any acquired resources.
338
341
     */
339
342
    public void release() {