From 3848813c768301727bc4ab1290a81db9be01c8fc Mon Sep 17 00:00:00 2001
From: Daniel Tiefnig <dtiefnig@sipwise.com>
Date: Fri, 20 May 2011 16:51:31 +0000
Subject: [PATCH] unified peer_id / peerid parameter name fixed a bug which
 looses peerid on rewrite rule deletion

---
 lib/admin/Controller/peering.pm | 22 +++++++++++-----------
 root/tt/peering_detail.tt       |  2 +-
 root/tt/peering_preferences.tt  |  2 +-
 root/tt/peering_rewrite.tt      | 10 ++++------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/lib/admin/Controller/peering.pm b/lib/admin/Controller/peering.pm
index 05b206d..984bb67 100644
--- a/lib/admin/Controller/peering.pm
+++ b/lib/admin/Controller/peering.pm
@@ -426,11 +426,11 @@ sub delete_peer : Local {
     my %settings;
 
     my $grpid = $c->request->params->{grpid};
-    my $peer_id = $c->request->params->{peerid};
+    my $peerid = $c->request->params->{peerid};
 
     unless(keys %messages) {
         if($c->model('Provisioning')->call_prov( $c, 'voip', 'delete_peer_host',
-                                                 { id => $peer_id
+                                                 { id => $peerid
                                                  },
                                                  undef
                                                ))
@@ -517,7 +517,7 @@ sub rewrite : Local {
     my ( $self, $c ) = @_;
     $c->stash->{template} = 'tt/peering_rewrite.tt';
     
-	my $peerid = $c->request->params->{peer_id};
+	my $peerid = $c->request->params->{peerid};
 
     my $peer_details;
     return unless $c->model('Provisioning')->call_prov( $c, 'voip', 'get_peer_host_details',
@@ -593,7 +593,7 @@ sub create_rewrite : Local {
         {
             $messages{$m} = 'Server.Voip.SavedSettings';
             $c->session->{messages} = \%messages;
-            $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+            $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
             return;
 		}
 		else
@@ -613,7 +613,7 @@ sub create_rewrite : Local {
     }
 
     $c->session->{messages} = \%messages;
-    $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+    $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
     return;
 }
 
@@ -696,14 +696,14 @@ sub delete_rewrite : Local {
         {
             $messages{$m} = 'Server.Voip.SavedSettings';
             $c->session->{messages} = \%messages;
-            $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+            $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
             return;
 		}
     } else {
     }
 
     $c->session->{messages} = \%messages;
-    $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+    $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
     return;
 }
 
@@ -756,7 +756,7 @@ sub edit_rewrite : Local {
         {
             $messages{$m} = 'Server.Voip.SavedSettings';
             $c->session->{messages} = \%messages;
-            $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+            $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
             return;
 		}
 		else
@@ -776,7 +776,7 @@ sub edit_rewrite : Local {
     }
 
     $c->session->{messages} = \%messages;
-    $c->response->redirect("/peering/rewrite?peer_id=$peerid#$a");
+    $c->response->redirect("/peering/rewrite?peerid=$peerid#$a");
     return;
 }
 
@@ -815,13 +815,13 @@ sub copy_rewrite : Local {
         {
             	$messages{cpmsg} = 'Server.Voip.SavedSettings';
 	            $c->session->{messages} = \%messages;
-    	        $c->response->redirect("/peering/rewrite?peer_id=$peerid");
+    	        $c->response->redirect("/peering/rewrite?peerid=$peerid");
         	    return;
 		}
 	}
 	else
 	{
-		$c->response->redirect("/peering/rewrite?peer_id=$peerid");
+		$c->response->redirect("/peering/rewrite?peerid=$peerid");
         return;
 	}
 
diff --git a/root/tt/peering_detail.tt b/root/tt/peering_detail.tt
index 662f74e..1ddf355 100644
--- a/root/tt/peering_detail.tt
+++ b/root/tt/peering_detail.tt
@@ -48,7 +48,7 @@
                      <a href="/peering/detail?group_id=[% grp.group.id %]"><span class="button-cancel">Cancel</span></a>
                   </div>
                 [% ELSE %]
-                  <div class="span-4"><a href="/peering/rewrite?peer_id=[% peer.id%]" class="aaction">[% peer.name %]</a></div>
+                  <div class="span-4"><a href="/peering/rewrite?peerid=[% peer.id%]" class="aaction">[% peer.name %]</a></div>
                   <div class="span-4">[% peer.ip %]</div>
                   <div class="span-3">[% peer.port %]</div>
                   <div class="span-3 append-1">[% peer.weight %]</div>
diff --git a/root/tt/peering_preferences.tt b/root/tt/peering_preferences.tt
index cc9bd3c..5d2d48d 100644
--- a/root/tt/peering_preferences.tt
+++ b/root/tt/peering_preferences.tt
@@ -5,7 +5,7 @@
 
       <div class="topsubmenu">
         <ul>
-          <li><a href="rewrite?peer_id=[% peer.peer_host.id %]"><span>Rewrite Rules</span></a></li>
+          <li><a href="rewrite?peerid=[% peer.peer_host.id %]"><span>Rewrite Rules</span></a></li>
         [% IF Catalyst.config.peer.preference_features %]
           <li class="selected"><a href="preferences?peerid=[% peer.peer_host.id %]"><span>Preferences</span></a></li>
         [% END %]
diff --git a/root/tt/peering_rewrite.tt b/root/tt/peering_rewrite.tt
index e8bb141..decfa6d 100644
--- a/root/tt/peering_rewrite.tt
+++ b/root/tt/peering_rewrite.tt
@@ -29,7 +29,7 @@
 
       <div class="topsubmenu">
         <ul>
-          <li class="selected"><a href="rewrite?peer_id=[% peer.peer_host.id %]"><span>Rewrite Rules</span></a></li>
+          <li class="selected"><a href="rewrite?peerid=[% peer.peer_host.id %]"><span>Rewrite Rules</span></a></li>
         [% IF Catalyst.config.peer.preference_features %]
           <li><a href="preferences?peerid=[% peer.peer_host.id %]"><span>Preferences</span></a></li>
         [% END %]
@@ -149,7 +149,6 @@
                     <input type="hidden" name="grpid" value="[% peer.peer_host.group_id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
-                    <input type="hidden" name="domain" value="[% domain.domain.domain %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="priority" value="[% rule.priority %]" />
                     <div class="span-4">
@@ -169,7 +168,7 @@
                     </div>
                   </form>
                   <div class="prepend-1 span-1 last">
-                      <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]#[% rw.id %]"><span class="button-cancel">Cancel</span></a>
+                      <a href="/peering/rewrite?peerid=[% peer.peer_host.id %]#[% rw.id %]"><span class="button-cancel">Cancel</span></a>
                   </div>
                 [% ELSE %]
                   <div class="span-4">[% rule.match_pattern %]</div>
@@ -177,11 +176,11 @@
                   <div class="span-4 append-1">[% rule.description %]</div>
                   <div class="span-1">
                   [% UNLESS Catalyst.session.admin.read_only %]
-                      <a href="/peering/rewrite?peer_id=[% peer.peer_host.id %]&editid=[% rule.id %]#[% rw.id %]"><span class="button-edit">Edit</span></a>
+                      <a href="/peering/rewrite?peerid=[% peer.peer_host.id %]&editid=[% rule.id %]#[% rw.id %]"><span class="button-edit">Edit</span></a>
                   [% END %]
                   </div>
                   <form action="/peering/delete_rewrite" method="post">
-                    <input type="hidden" name="domain" value="[% domain.domain.domain %]" />
+                    <input type="hidden" name="peerid" value="[% peer.peer_host.id %]" />
                     <input type="hidden" name="rewriteid" value="[% rule.id %]" />
                     <input type="hidden" name="direction" value="[% rule.direction %]" />
                     <input type="hidden" name="field" value="[% rule.field %]" />
@@ -206,7 +205,6 @@
                   <input type="hidden" name="direction" value="[% rw.dir %]" />
                   <input type="hidden" name="field" value="[% rw.field%]" />
                   <input type="hidden" name="priority" value="[% priority - 1 %]" />
-                  <input type="hidden" name="domain" value="[% domain.domain.domain %]" />
                   <div class="span-1">&nbsp;</div>
                   <div class="span-4">
                     <input type="text" size="15" id="addtxt" title="string, match pattern"