Ignore:
Timestamp:
05/15/13 16:17:00 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge SQL changes and other miscellaneous fixes from /trunk through r553.

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/stable

  • branches/stable/templates/edit.tmpl

    r593 r594  
    5555        <option selected="selected">--</option></TMPL_UNLESS>
    5656<TMPL_LOOP NAME=nodelist>
    57         <option <TMPL_IF selme>selected="selected"</TMPL_IF> value="<TMPL_VAR NAME=nodeid>"><TMPL_VAR NAME=nodename></option></TMPL_LOOP>
     57        <option value="<TMPL_VAR NAME=node_id>"<TMPL_IF selme> selected</TMPL_IF>><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
    5858</select>
    5959<TMPL_ELSE>
     
    8282<TMPL_IF swipable>
    8383<TMPL_IF maychange>
    84 <input type="checkbox" name="swip" <TMPL_IF swip>checked="checked"</TMPL_IF>>
     84<input type="checkbox" name="swip"<TMPL_IF swip> checked="checked"</TMPL_IF>>
    8585<TMPL_ELSE>
    8686<TMPL_IF swip>Yes<TMPL_ELSE>No</TMPL_IF>
     
    101101<td class="regular">
    102102<TMPL_IF maychange>
    103 <input type="text" name="circid" value="<TMPL_VAR NAME=circid>" maxlength=64 size=64 class="regular">
     103<input type="text" name="circid" value="<TMPL_VAR ESCAPE=HTML NAME=circid>" maxlength=64 size=64 class="regular">
    104104<TMPL_ELSE>
    105 <TMPL_VAR NAME=circid>
     105<TMPL_VAR ESCAPE=HTML NAME=circid>
    106106</TMPL_IF>
    107107</td>
     
    112112<td class="regular">
    113113<TMPL_IF maychange>
    114 <input type="text" name="desc" value="<TMPL_VAR NAME=desc>" maxlength=64 size=64 class="regular">
     114<input type="text" name="desc" value="<TMPL_VAR ESCAPE=HTML NAME=desc>" maxlength=64 size=64 class="regular">
    115115<TMPL_ELSE>
    116 <TMPL_VAR NAME=desc>
     116<TMPL_VAR ESCAPE=HTML NAME=desc>
    117117</TMPL_IF>
    118118</td>
     
    122122<td class="heading" valign="top">Notes:</td>
    123123<td class="regular">
    124 <TMPL_IF maychange><textarea rows="8" cols="64" name="notes" class="regular"><TMPL_VAR NAME=notes></textarea>
     124<TMPL_IF maychange><textarea rows="8" cols="64" name="notes" class="regular"><TMPL_VAR ESCAPE=HTML NAME=notes></textarea>
    125125<TMPL_ELSE>
    126 <TMPL_VAR NAME=notes>
     126<TMPL_VAR ESCAPE=HTML NAME=notes>
    127127</TMPL_IF>
    128128</td>
     
    134134<td class="regular">
    135135<TMPL_IF maychange>
    136 <textarea rows="3" cols="64" name="privdata" class="regular"><TMPL_VAR NAME=privdata></textarea>
     136<textarea rows="3" cols="64" name="privdata" class="regular"><TMPL_VAR ESCAPE=HTML NAME=privdata></textarea>
    137137<TMPL_ELSE>
    138 <TMPL_VAR NAME=privdata>
     138<TMPL_VAR ESCAPE=HTML NAME=privdata>
    139139</TMPL_IF>
    140140</td>
Note: See TracChangeset for help on using the changeset viewer.