Changeset 239


Ignore:
Timestamp:
02/23/12 15:36:59 (13 years ago)
Author:
Kris Deugau
Message:

/trunk

Checkpoint; domain/reverse zone list almost complete. See #26.
Still need to do active/inactive

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/DNSDB.pm

    r237 r239  
    12021202
    12031203  my @filterargs;
    1204   $args{filter} =~ s/\./\[\.\]/g if $args{filter};
    1205   push @filterargs, $args{startwith} if $args{startwith};
     1204  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
     1205  push @filterargs, "^$args{startwith}" if $args{startwith};
     1206  $args{filter} =~ s/\./\[\.\]/g if $args{filter};      # only match literal dots, usually in reverse zones
    12061207  push @filterargs, $args{filter} if $args{filter};
    12071208
    … …  
    12361237
    12371238  $args{sortorder} = 'ASC' if !grep $args{sortorder}, ('ASC','DESC');
    1238   $args{offset} = 0 if !$args{offset};
     1239  $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
    12391240
    12401241  my @filterargs;
    1241   $args{filter} =~ s/\./\[\.\]/g if $args{filter};
    1242   push @filterargs, $args{startwith} if $args{startwith};
     1242  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
     1243  push @filterargs, "^$args{startwith}" if $args{startwith};
     1244  $args{filter} =~ s/\./\[\.\]/g if $args{filter};      # only match literal dots, usually in reverse zones
    12431245  push @filterargs, $args{filter} if $args{filter};
    12441246
    … …  
    12531255        ($args{filter} ? " AND domain ~* ?" : '');
    12541256  } else {
     1257##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
    12551258    $args{sortby} = 'revnet' if !grep $args{sortby}, ('domain','group','status');
    12561259    $sql = "SELECT rdns_id,revnet,status,groups.group_name AS group FROM revzones".
    … …  
    12611264  }
    12621265  # A common tail.
    1263   $sql .= " ORDER BY ".($args{sortby} eq 'group' ? 'groups.group_name' : $args{sortby}).
    1264         " $args{sortorder} ".($args{offset} eq 'all' ? '' : " LIMIT $config{perpage}".
     1266  $sql .= " ORDER BY ".($args{sortby} eq 'group' ? 'groups.group_name' : $args{sortby})." $args{sortorder} ".
     1267        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage}".
    12651268        " OFFSET ".$args{offset}*$config{perpage});
    12661269  my $sth = $dbh->prepare($sql);
    … …  
    12721275    $row{domainid} = $data[0];
    12731276    $row{domain} = $data[1];
    1274     $row{status} = ($data[2] ? 'Active' : 'Inactive');
     1277    $row{status} = $data[2];
    12751278    $row{group} = $data[3];
    1276     $row{bg} = ($rownum++)%2;
    1277     $row{mkactive} = !$data[2];
    1278 #    $row{sid} = $args{sid};
    1279     $row{offset} = $args{offset};
    1280 # ACLs
    1281 #    $row{domain_edit} = ($permissions{admin} || $permissions{domain_edit});
    1282 #    $row{domain_delete} = ($permissions{admin} || $permissions{domain_delete});
    12831279    push @zonelist, \%row;
    12841280  }

  • trunk/dns.cgi

    r238 r239  
    300300
    301301} elsif ($webvar{page} eq 'domlist' or $webvar{page} eq 'index') {
     302
     303  $page->param(domlist => 1);
    302304
    303305# hmm.  seeing problems in some possibly-not-so-corner cases.
    … …  
    19601962        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder
    19611963        ) );
    1962   foreach (@$zonelist) {
    1963     $_->{sid} = $sid;
    1964     $_->{domain_edit} = ($permissions{admin} || $permissions{domain_edit});
    1965     $_->{domain_delete} = ($permissions{admin} || $permissions{domain_delete});
    1966   }
     1964# probably don't need this, keeping for reference for now
     1965#  foreach (@$zonelist) {
     1966#  }
    19671967  $page->param(domtable => $zonelist);
    19681968} # end listdomains()

  • trunk/templates/domlist.tmpl

    r147 r239  
    99</TMPL_IF>
    1010<TMPL_IF errmsg>
    11 <div class='errmsg'><TMPL_VAR NAME=errmsg></div>
     11<div class="errmsg"><TMPL_VAR NAME=errmsg></div>
    1212</TMPL_IF>
    1313
    1414<table width="98%">
    15 <tr><th colspan="3"><div class="center maintitle">Domain list</div></th></tr>
     15<tr><th colspan="3"><div class="center maintitle"><TMPL_IF domlist>Domain<TMPL_ELSE>Reverse zone</TMPL_IF> list</div></th></tr>
    1616<tr>
    1717<td class="leftthird"><TMPL_INCLUDE NAME="pgcount.tmpl"></td>
    … …  
    1919<td class="rightthird"><TMPL_INCLUDE NAME="sbox.tmpl"></td>
    2020</tr>
    21 <tr><td colspan="3" align="center"><TMPL_INCLUDE NAME="lettsearch.tmpl"></td></tr>
    22 <tr><td colspan="3" align="right"><TMPL_IF domain_create><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newdomain">New Domain</a></TMPL_IF></td></tr>
     21<TMPL_IF domlist><tr><td colspan="3" align="center"><TMPL_INCLUDE NAME="lettsearch.tmpl"></td></tr></TMPL_IF>
     22<tr><td colspan="3" align="right">
     23<TMPL_IF domain_create>
     24<TMPL_IF domlist>
     25<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newdomain">New Domain</a>
     26<TMPL_ELSE>
     27<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=newrevzone">New Reverse Zone</a>
     28</TMPL_IF>
     29</TMPL_IF>
     30</td></tr>
    2331</table>
    2432
    … …  
    3745<TMPL_IF name=domtable>
    3846<TMPL_LOOP name=domtable>
    39 <tr class="row<TMPL_VAR name=bg>">
    40         <td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domainid>&amp;defrec=n"><TMPL_VAR NAME=domain></a></td>
    41         <td><TMPL_VAR name=status></td>
     47<tr class="row<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
     48        <td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=domainid>&amp;defrec=n<TMPL_UNLESS domlist>&amp;revrec=y</TMPL_UNLESS>"><TMPL_VAR NAME=domain></a></td>
     49        <td><TMPL_IF status>Active<TMPL_ELSE>Inactive</TMPL_IF></td>
    4250        <td><TMPL_VAR name=group></td>
    43 <TMPL_IF domain_edit>   <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=domlist<TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;domstatus=<TMPL_IF NAME=mkactive>domon<TMPL_ELSE>domoff</TMPL_IF>"><TMPL_IF NAME=mkactive>activate<TMPL_ELSE>deactivate</TMPL_IF></a></td></TMPL_IF>
    44 <TMPL_IF domain_delete> <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=deldom&amp;id=<TMPL_VAR NAME=domainid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
     51<TMPL_IF domain_edit>   <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_VAR NAME=curpage><TMPL_IF NAME=offset>&amp;offset=<TMPL_VAR NAME=offset></TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>&amp;domstatus=<TMPL_IF status>domoff<TMPL_ELSE>domon</TMPL_IF>"><TMPL_IF status>deactivate<TMPL_ELSE>activate</TMPL_IF></a></td></TMPL_IF>
     52<TMPL_IF domain_delete> <td align="center"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=<TMPL_IF domlist>deldom<TMPL_ELSE>delrevzone</TMPL_IF>&amp;id=<TMPL_VAR NAME=domainid>"><img src="images/trash2.png" alt="[ Delete ]" /></a></td></TMPL_IF>
    4553</tr>
    4654</TMPL_LOOP>
    4755<TMPL_ELSE>
    48 <tr><td colspan="5" align="center">No domains found</td></tr>
     56<tr><td colspan="5" align="center">No <TMPL_IF domlist>domains<TMPL_ELSE>reverse zones</TMPL_IF> found</td></tr>
    4957</TMPL_IF>
    5058</table>
Note: See TracChangeset for help on using the changeset viewer.