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:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/templates/aclerror.tmpl

    r593 r594  
    22<div class="center">You do not have permission to <TMPL_VAR NAME=ipdbfunc>.  Access denied.</div>
    33<br>
     4<TMPL_IF 0><TMPL_VAR NAME=webpath></TMPL_IF>

  • branches/stable/templates/admin/alloc.tmpl

    r593 r594  
    22<TMPL_VAR NAME=errmsg>
    33<TMPL_ELSE>
     4<TMPL_IF warnmsg><div class="warnmsg"><TMPL_VAR NAME=warnmsg></div></TMPL_IF>
    45<form method="POST" action="admin.cgi">
    56<fieldset><legend class="noshow">&nbsp;</legend>

  • branches/stable/templates/admin/main.tmpl

    r593 r594  
    88Allocate block/IP: <input name="cidr"> as
    99<select name="alloctype">
    10 <TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_UNLESS selected> selected</TMPL_UNLESS>><TMPL_VAR NAME=dispname></option>
     10<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option>
    1111</TMPL_LOOP>
    1212</select>
    … …  
    2929Bump "last updated" timestamp on this master:
    3030<select name="whichmaster">
    31 <TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=masterdate>)</option>
     31<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=mtime>)</option>
    3232</TMPL_LOOP>
    3333</select>

  • branches/stable/templates/assign.tmpl

    r593 r594  
    3939<select name="alloctype">
    4040<TMPL_LOOP name=typelist>
    41         <option value="<TMPL_VAR NAME=tval>"<TMPL_VAR NAME=sel>><TMPL_VAR NAME=type></option></TMPL_LOOP>
     41        <option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option></TMPL_LOOP>
    4242</select>
    4343<input type="button" value=" ? " onclick="helpAllocTypes()" class="regular">
    … …  
    6262<td>
    6363<select name="node">
    64         <option selected="selected">-</option>
     64        <option selected>-</option>
    6565<TMPL_LOOP NAME=nodelist>
    66         <option value="<TMPL_VAR NAME=nid>"><TMPL_VAR NAME=nname></option></TMPL_LOOP>
     66        <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
    6767</select>
    6868&nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new location</a>

  • branches/stable/templates/dberr.tmpl

    r593 r594  
    33<input type="button" value="Back" onclick="history.go(-1)">
    44</div>
     5<TMPL_IF webpath></TMPL_IF>

  • branches/stable/templates/delete.tmpl

    r593 r594  
    2727<tr class="row0">
    2828<td>Circuit ID:</td>
    29 <td><TMPL_VAR NAME=circid></td>
     29<td><TMPL_VAR ESCAPE=HTML NAME=circid></td>
    3030</tr>
    3131
    3232<tr class="row1">
    3333<td valign="top">Description/Name:</td>
    34 <td><TMPL_VAR NAME=desc></td>
     34<td><TMPL_VAR ESCAPE=HTML NAME=desc></td>
    3535</tr>
    3636
    … …  
    4242<TMPL_IF privdata>
    4343<tr class="row1">
    44 <td>Restricted data:</td>
     44<td valign="top">Restricted data:</td>
    4545<td><TMPL_VAR NAME=privdata></td>
    4646</tr>
    … …  
    6060<input type="button" value="Back" onclick="history.go(-1)"><input type="submit" value="Confirm">
    6161<input type="hidden" name="block" value="<TMPL_VAR NAME=block>">
    62 <input type="hidden" name="city" value="<TMPL_VAR NAME=city>">
    6362<input type="hidden" name="alloctype" value="<TMPL_VAR NAME=type>">
    6463<input type="hidden" name="action" value="finaldelete">

  • 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>

  • branches/stable/templates/index.tmpl

    r593 r594  
    1010</tr>
    1111<TMPL_LOOP NAME=masterlist>
    12 <tr class="row<TMPL_VAR name=rowclass>">
     12<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    1313<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showmaster&amp;block=<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master></a></td>
    1414<td><TMPL_VAR NAME=routed></td>
    1515<td><TMPL_VAR NAME=allocated></td>
    1616<td><TMPL_VAR NAME=free></td>
    17 <td><TMPL_VAR NAME=bigfree></td>
     17<td><TMPL_VAR ESCAPE=HTML NAME=bigfree></td>
    1818</tr>
    1919</TMPL_LOOP>

  • branches/stable/templates/listpool.tmpl

    r593 r594  
    2828
    2929<TMPL_LOOP name=poolips>
    30 <tr class="row<TMPL_VAR NAME=rowclass>">
     30<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    3131<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=ip>"><TMPL_VAR NAME=ip></a></td>
    3232<td><TMPL_VAR NAME=custid></td>

  • branches/stable/templates/nodesearch.tmpl

    r593 r594  
    1111<td><select name="node">
    1212        <option>--</option>
    13 <TMPL_LOOP NAME=nodelist>       <option value="<TMPL_VAR NAME=nodeid>"><TMPL_VAR NAME=nodename></option>
     13<TMPL_LOOP NAME=nodelist>       <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option>
    1414</TMPL_LOOP>
    1515</select></td>

  • branches/stable/templates/showmaster.tmpl

    r593 r594  
    1313
    1414<TMPL_LOOP NAME=routedlist>
    15 <tr class="row<TMPL_VAR NAME=rowclass>">
     15<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    1616<td><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showrouted&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a></td>
    1717<td><TMPL_VAR NAME=city></td>
    1818<td><TMPL_VAR NAME=nsubs></td>
    1919<td><TMPL_VAR NAME=nfree></td>
    20 <td><TMPL_VAR NAME=lfree></td>
     20<td><TMPL_VAR ESCAPE=HTML NAME=lfree></td>
    2121</tr>
    2222</TMPL_LOOP>
    … …  
    5353
    5454<TMPL_LOOP name=unrouted>
    55 <tr class="row<TMPL_VAR NAME=rowclass>">
     55<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    5656<td><TMPL_VAR NAME=fblock></td>
    5757<td><TMPL_VAR NAME=frange></td>

  • branches/stable/templates/showrouted.tmpl

    r593 r594  
    1515
    1616<TMPL_LOOP NAME=blocklist>
    17 <tr class="row<TMPL_VAR NAME=rowclass>">
     17<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    1818<td>
    1919<TMPL_IF subblock>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=edit&amp;block=<TMPL_VAR NAME=block>"><TMPL_VAR NAME=block></a>
    … …  
    2323<td><TMPL_VAR NAME=type></td>
    2424<td><TMPL_VAR NAME=custid></td>
    25 <td><TMPL_VAR NAME=swip></td>
     25<td><TMPL_VAR NAME=swip><TMPL_IF partswip><small>*</small></TMPL_IF></td>
    2626<td><TMPL_VAR NAME=desc></td>
    2727</tr>
    … …  
    3636<fieldset><legend class="noshow">&nbsp;</legend>
    3737<input type=hidden name=action value="delete">
    38 <input type=hidden name=block value="1.2.12.0/23">
     38<input type=hidden name=block value="<TMPL_VAR NAME=master>">
    3939<input type=hidden name=alloctype value="rm">
    4040<input type=submit value=" Remove this block ">
    … …  
    5858
    5959<TMPL_LOOP name=unassigned>
    60 <tr class="row<TMPL_VAR NAME=rowclass>">
     60<tr class="row<TMPL_IF __odd__>0<TMPL_ELSE>1</TMPL_IF>">
    6161<td><TMPL_IF subblock>Sub </TMPL_IF><a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=assign&amp;block=<TMPL_VAR NAME=fblock>&amp;fbtype=<TMPL_VAR NAME=fbtype>"><TMPL_VAR NAME=fblock></a></td>
    6262<td><TMPL_VAR NAME=frange></td>

  • branches/stable/templates/update.tmpl

    r593 r594  
    4141<tr class="row0">
    4242<td>Circuit ID:</td>
    43 <td><TMPL_VAR NAME=circid></td>
     43<td><TMPL_VAR ESCAPE=HTML NAME=circid></td>
    4444</tr>
    4545
    4646<tr class="row1">
    4747<td valign="top">Description/Name:</td>
    48 <td><TMPL_VAR NAME=desc></td>
     48<td><TMPL_VAR ESCAPE=HTML NAME=desc></td>
    4949</tr>
    5050
Note: See TracChangeset for help on using the changeset viewer.