From 7fe0f4c112d154dd60a413f3a8d13dac35291c86 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 1 Aug 2016 10:59:50 +0200
Subject: [PATCH] (firewall, nat 1-to-1) fix copy feature

---
 src/www/firewall_nat_1to1_edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/www/firewall_nat_1to1_edit.php b/src/www/firewall_nat_1to1_edit.php
index a611aaa2a..34758b509 100644
--- a/src/www/firewall_nat_1to1_edit.php
+++ b/src/www/firewall_nat_1to1_edit.php
@@ -53,21 +53,21 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     if (isset($configId)) {
         // copy settings from config
         foreach (array('disabled','interface','external','descr','natreflection') as $fieldname) {
-          if (isset($a_1to1[$id][$fieldname])) {
-              $pconfig[$fieldname] = $a_1to1[$id][$fieldname];
+          if (isset($a_1to1[$configId][$fieldname])) {
+              $pconfig[$fieldname] = $a_1to1[$configId][$fieldname];
           } else {
               $pconfig[$fieldname] = null;
           }
         }
         // read settings with some kind of logic
         address_to_pconfig(
-          $a_1to1[$id]['source'], $pconfig['src'],
+          $a_1to1[$configId]['source'], $pconfig['src'],
           $pconfig['srcmask'], $pconfig['srcnot'],
           $pconfig['__unused__'],$pconfig['__unused__']
         );
 
         address_to_pconfig(
-          $a_1to1[$id]['destination'], $pconfig['dst'],
+          $a_1to1[$configId]['destination'], $pconfig['dst'],
           $pconfig['dstmask'], $pconfig['dstnot'],
           $pconfig['__unused__'],$pconfig['__unused__']
         );