utf8 pris en compte
This commit is contained in:
parent
e6da9f192e
commit
13cb33d7bb
@ -131,8 +131,9 @@ sub rt_dom_mod_entry {
|
|||||||
$str_new .= "$$param{newrdata}";
|
$str_new .= "$$param{newrdata}";
|
||||||
}
|
}
|
||||||
|
|
||||||
say "old : $str_old";
|
say "old rdata : $$param{oldrdata}";
|
||||||
say "new : $str_new";
|
say "new rdata : $$param{newrdata}";
|
||||||
|
|
||||||
$zf->rr_mod( $str_old, $str_new);
|
$zf->rr_mod( $str_old, $str_new);
|
||||||
$zone->update( $zf );
|
$zone->update( $zf );
|
||||||
|
|
||||||
|
@ -14,8 +14,10 @@ has [ qw/zonefile/ ] => qw/ is rw required 1/;
|
|||||||
|
|
||||||
sub rr_array_del {
|
sub rr_array_del {
|
||||||
my ($zones, $rr) = @_;
|
my ($zones, $rr) = @_;
|
||||||
my @z = grep { $_->plain ne $rr->plain } @$zones;
|
my $todel = $rr->plain;
|
||||||
[ @z ]
|
utf8::decode($todel);
|
||||||
|
|
||||||
|
[grep { my $v = $_->plain; utf8::decode($v); $v ne $rr->plain } @$zones]
|
||||||
}
|
}
|
||||||
|
|
||||||
sub rr_array_add {
|
sub rr_array_add {
|
||||||
@ -67,6 +69,8 @@ sub rr_array_dump {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
utf8::decode($dump);
|
||||||
|
|
||||||
$dump
|
$dump
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,7 +109,10 @@ sub serial {
|
|||||||
# remove a raw line that represents the RR
|
# remove a raw line that represents the RR
|
||||||
sub rr_del_raw {
|
sub rr_del_raw {
|
||||||
my ($self, $rrline) = @_;
|
my ($self, $rrline) = @_;
|
||||||
|
utf8::decode($rrline);
|
||||||
|
say "to delete raw : $rrline";
|
||||||
my $rr = Net::DNS::RR->new($rrline);
|
my $rr = Net::DNS::RR->new($rrline);
|
||||||
|
say "to delete reformed : " . $rr->plain;
|
||||||
$self->rr_del($rr)
|
$self->rr_del($rr)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,6 +124,8 @@ sub rr_del {
|
|||||||
# add a raw line that represents the RR
|
# add a raw line that represents the RR
|
||||||
sub rr_add_raw {
|
sub rr_add_raw {
|
||||||
my ($self, $rrline) = @_;
|
my ($self, $rrline) = @_;
|
||||||
|
utf8::decode($rrline);
|
||||||
|
say "to add : $rrline";
|
||||||
my $rr = Net::DNS::RR->new($rrline);
|
my $rr = Net::DNS::RR->new($rrline);
|
||||||
$self->rr_add($rr)
|
$self->rr_add($rr)
|
||||||
}
|
}
|
||||||
@ -128,11 +137,11 @@ sub rr_add {
|
|||||||
|
|
||||||
sub rr_mod {
|
sub rr_mod {
|
||||||
my ($self, $rrline_old, $rrline_new) = @_;
|
my ($self, $rrline_old, $rrline_new) = @_;
|
||||||
|
|
||||||
$self->rr_del_raw($rrline_old);
|
$self->rr_del_raw($rrline_old);
|
||||||
$self->rr_add_raw($rrline_new);
|
$self->rr_add_raw($rrline_new);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sub rr_array_to_array {
|
sub rr_array_to_array {
|
||||||
my ($self) = shift;
|
my ($self) = shift;
|
||||||
my $rr_list;
|
my $rr_list;
|
||||||
@ -147,6 +156,11 @@ sub rr_array_to_array {
|
|||||||
$$rr{class} = $list[2];
|
$$rr{class} = $list[2];
|
||||||
$$rr{type} = $list[3];
|
$$rr{type} = $list[3];
|
||||||
|
|
||||||
|
utf8::decode($$rr{name});
|
||||||
|
utf8::decode($$rr{ttl});
|
||||||
|
utf8::decode($$rr{class});
|
||||||
|
utf8::decode($$rr{type});
|
||||||
|
|
||||||
if($list[3] =~ /SOA/) {
|
if($list[3] =~ /SOA/) {
|
||||||
$$rr{ns} = $list[4];
|
$$rr{ns} = $list[4];
|
||||||
$$rr{postmaster} = $list[5];
|
$$rr{postmaster} = $list[5];
|
||||||
@ -155,16 +169,29 @@ sub rr_array_to_array {
|
|||||||
$$rr{retry} = $list[8];
|
$$rr{retry} = $list[8];
|
||||||
$$rr{expire} = $list[9];
|
$$rr{expire} = $list[9];
|
||||||
$$rr{minimum} = $list[10];
|
$$rr{minimum} = $list[10];
|
||||||
|
|
||||||
|
utf8::decode($$rr{ns});
|
||||||
|
utf8::decode($$rr{postmaster});
|
||||||
|
utf8::decode($$rr{serial});
|
||||||
|
utf8::decode($$rr{refresh});
|
||||||
|
utf8::decode($$rr{retry});
|
||||||
|
utf8::decode($$rr{expire});
|
||||||
|
utf8::decode($$rr{minimum});
|
||||||
}
|
}
|
||||||
elsif($list[3] =~ /^(A(AAA)?|CNAME|NS)$/) {
|
elsif($list[3] =~ /^(A(AAA)?|CNAME|NS)$/) {
|
||||||
$$rr{rdata} = $list[4];
|
$$rr{rdata} = $list[4];
|
||||||
|
utf8::decode($$rr{rdata});
|
||||||
}
|
}
|
||||||
elsif($list[3] =~ /^MX$/) {
|
elsif($list[3] =~ /^MX$/) {
|
||||||
$$rr{priority} = $list[4];
|
$$rr{priority} = $list[4];
|
||||||
$$rr{rdata} = $list[5];
|
$$rr{rdata} = $list[5];
|
||||||
|
|
||||||
|
utf8::decode($$rr{priority});
|
||||||
|
utf8::decode($$rr{rdata});
|
||||||
}
|
}
|
||||||
elsif($list[3] =~ /^TXT$/) {
|
elsif($list[3] =~ /^TXT$/) {
|
||||||
$$rr{rdata} = $_->rdstring;
|
$$rr{rdata} = $_->rdstring;
|
||||||
|
utf8::decode($$rr{rdata});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
die "This RR is not available : " . $_->plain;
|
die "This RR is not available : " . $_->plain;
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
<% FOREACH d IN alldomains %>
|
<% FOREACH d IN alldomains %>
|
||||||
<tr>
|
<tr>
|
||||||
<td> <a href="/domain/details/<% d.domain %>/"><% d.domain %></a> </td>
|
<td> <a href="/domain/details/<% d.domain %>"><% d.domain %></a> </td>
|
||||||
<td><% d.login %></td>
|
<td><% d.login %></td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
|
@ -34,13 +34,13 @@
|
|||||||
<input type="hidden" name="oldname" value="<% rr.name %>"/>
|
<input type="hidden" name="oldname" value="<% rr.name %>"/>
|
||||||
<input type="hidden" name="oldtype" value="<% rr.type %>"/>
|
<input type="hidden" name="oldtype" value="<% rr.type %>"/>
|
||||||
<input type="hidden" name="oldttl" value="<% rr.ttl %>"/>
|
<input type="hidden" name="oldttl" value="<% rr.ttl %>"/>
|
||||||
<input type="hidden" name="oldrdata" value="<% rr.rdata %>"/>
|
<textarea type="hidden" style="display:none" name="oldrdata"><% rr.rdata %></textarea>
|
||||||
|
|
||||||
<td><input type='text' name='newname' class="form-control" value='<% rr.name %>'/></td>
|
<td><input type='text' name='newname' class="form-control" value='<% rr.name %>'/></td>
|
||||||
<td><% rr.class %></td>
|
<td><% rr.class %></td>
|
||||||
<td><input type='text' name='newtype' size='8' class="form-control" value='<% rr.type %>'/></td>
|
<td><input type='text' name='newtype' size='8' class="form-control" value='<% rr.type %>'/></td>
|
||||||
<td><input type='number' name='newttl' size='4' class="form-control" value='<% rr.ttl %>'/></td>
|
<td><input type='number' name='newttl' size='4' class="form-control" value='<% rr.ttl %>'/></td>
|
||||||
<td><input type='text' name='newrdata' class="form-control" value='<% rr.rdata %>'/></td>
|
<td><textarea name='newrdata' class="form-control" rows=1 ><% rr.rdata %></textarea></td>
|
||||||
<td><input type='submit' id='submit' class="btn btn-success btn-xs" value='✔' /></td>
|
<td><input type='submit' id='submit' class="btn btn-success btn-xs" value='✔' /></td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
|
Reference in New Issue
Block a user