From 13cb33d7bb77aff2a548233b010975a9a0486d0c Mon Sep 17 00:00:00 2001
From: karchnu <karchnu@karchnu.fr>
Date: Mon, 21 Dec 2015 16:14:45 +0100
Subject: [PATCH] utf8 pris en compte

---
 lib/rt/domain.pm        |  5 +++--
 lib/zonefile.pm         | 33 ++++++++++++++++++++++++++++++---
 views/administration.tt |  2 +-
 views/details.tt        |  4 ++--
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/lib/rt/domain.pm b/lib/rt/domain.pm
index 24df4c3..cc2b7f4 100644
--- a/lib/rt/domain.pm
+++ b/lib/rt/domain.pm
@@ -131,8 +131,9 @@ sub rt_dom_mod_entry {
             $str_new .= "$$param{newrdata}";
         }
 
-        say "old : $str_old";
-        say "new : $str_new";
+        say "old rdata : $$param{oldrdata}";
+        say "new rdata : $$param{newrdata}";
+
         $zf->rr_mod( $str_old, $str_new);
         $zone->update( $zf );
 
diff --git a/lib/zonefile.pm b/lib/zonefile.pm
index ed01e60..e4e5ccb 100644
--- a/lib/zonefile.pm
+++ b/lib/zonefile.pm
@@ -14,8 +14,10 @@ has [ qw/zonefile/ ] => qw/ is rw required 1/;
 
 sub rr_array_del {
     my ($zones, $rr) = @_;
-    my @z = grep { $_->plain ne $rr->plain } @$zones;
-    [ @z ]
+    my $todel = $rr->plain;
+    utf8::decode($todel);
+
+    [grep { my $v = $_->plain; utf8::decode($v); $v ne $rr->plain } @$zones]
 }
 
 sub rr_array_add {
@@ -67,6 +69,8 @@ sub rr_array_dump {
         }
     }
 
+    utf8::decode($dump);
+
     $dump
 }
 
@@ -105,7 +109,10 @@ sub serial {
 # remove a raw line that represents the RR
 sub rr_del_raw {
     my ($self, $rrline) = @_;
+    utf8::decode($rrline);
+    say "to delete raw : $rrline";
     my $rr = Net::DNS::RR->new($rrline);
+    say "to delete reformed : " . $rr->plain;
     $self->rr_del($rr)
 }
 
@@ -117,6 +124,8 @@ sub rr_del {
 # add a raw line that represents the RR
 sub rr_add_raw {
     my ($self, $rrline) = @_;
+    utf8::decode($rrline);
+    say "to add : $rrline";
     my $rr = Net::DNS::RR->new($rrline);
     $self->rr_add($rr)
 }
@@ -128,11 +137,11 @@ sub rr_add {
 
 sub rr_mod {
     my ($self, $rrline_old, $rrline_new) = @_;
+
     $self->rr_del_raw($rrline_old);
     $self->rr_add_raw($rrline_new);
 }
 
-
 sub rr_array_to_array {
     my ($self) = shift;
     my $rr_list;
@@ -147,6 +156,11 @@ sub rr_array_to_array {
         $$rr{class} = $list[2];
         $$rr{type} = $list[3];
 
+        utf8::decode($$rr{name});
+        utf8::decode($$rr{ttl});
+        utf8::decode($$rr{class});
+        utf8::decode($$rr{type});
+
         if($list[3] =~ /SOA/) {
             $$rr{ns} = $list[4];
             $$rr{postmaster} = $list[5];
@@ -155,16 +169,29 @@ sub rr_array_to_array {
             $$rr{retry} = $list[8];
             $$rr{expire} = $list[9];
             $$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)$/) {
             $$rr{rdata} = $list[4];
+            utf8::decode($$rr{rdata});
         }
         elsif($list[3] =~ /^MX$/) {
             $$rr{priority} = $list[4];
             $$rr{rdata} = $list[5];
+
+            utf8::decode($$rr{priority});
+            utf8::decode($$rr{rdata});
         }
         elsif($list[3] =~ /^TXT$/) {
             $$rr{rdata} = $_->rdstring;
+            utf8::decode($$rr{rdata});
         }
         else {
             die "This RR is not available : " . $_->plain;
diff --git a/views/administration.tt b/views/administration.tt
index 1b9365a..ddd97ab 100644
--- a/views/administration.tt
+++ b/views/administration.tt
@@ -17,7 +17,7 @@
 
         <% FOREACH d IN alldomains %>
             <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>
diff --git a/views/details.tt b/views/details.tt
index cf08ac2..4985fa9 100644
--- a/views/details.tt
+++ b/views/details.tt
@@ -34,13 +34,13 @@
                 <input type="hidden" name="oldname" value="<% rr.name %>"/>
                 <input type="hidden" name="oldtype" value="<% rr.type %>"/>
                 <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><% rr.class %></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='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>