e-smith-portforwarding/sme7/e-smith-portforwarding-1.2.0-rmDuplicates.patch

diff -Nur -x '*.orig' -x '*.rej' e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding mezzanine_patched_e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding
--- e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding 2005-03-18 13:31:36.000000000 +1100
+++ mezzanine_patched_e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding       2008-02-10 10:13:32.000000000 +1100
@@ -124,22 +124,6 @@
         <trans>Remove</trans>
     </entry>
     <entry>
-        <base>SOURCE_PORT</base>
-        <trans>Source Port(s)</trans>
-    </entry>
-    <entry>
-        <base>DESTINATION_HOST</base>
-        <trans>Destination Host IP Address</trans>
-    </entry>
-    <entry>
-        <base>DESTINATION_PORT</base>
-        <trans>Destination Port(s)</trans>
-    </entry>
-    <entry>
-        <base>PROTOCOL</base>
-        <trans>Protocol</trans>
-    </entry>
-    <entry>
         <base>ERR_NO_MASQ_RECORD</base>
         <trans>Cannot retrieve masq record from the configuration
         database.</trans>
diff -Nur -x '*.orig' -x '*.rej' e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm mezzanine_patched_e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm
--- e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm 2008-02-10 10:17:13.000000000 +1100
+++ mezzanine_patched_e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm       2008-02-10 10:14:30.000000000 +1100
@@ -142,22 +142,22 @@
         print $q->Tr(
             esmith::cgi::genSmallCell(
                 $q,
-                $self->localise('PROTOCOL'),
+                $self->localise('LABEL_PROTOCOL'),
                 "header"
             ), "        ",
             esmith::cgi::genSmallCell(
                 $q,
-                $self->localise('SOURCE_PORT'),
+                $self->localise('LABEL_SOURCE_PORT'),
                 "header"
             ), "        ",
             esmith::cgi::genSmallCell(
                 $q,
-                $self->localise('DESTINATION_HOST'),
+                $self->localise('LABEL_DESTINATION_HOST'),
                 "header"
             ), "        ",
             esmith::cgi::genSmallCell(
                 $q,
-                $self->localise('DESTINATION_PORT'),
+                $self->localise('LABEL_DESTINATION_PORT'),
                 "header",
             ), "        ",
             esmith::cgi::genSmallCell(
@@ -486,13 +486,13 @@
 
     my $dhost = $self->get_destination_host();
     foreach my $tablearrayref (
-            [$self->localise('PROTOCOL')
+            [$self->localise('LABEL_PROTOCOL')
                 => $q->param('protocol')],
-            [$self->localise('SOURCE_PORT')
+            [$self->localise('LABEL_SOURCE_PORT')
                 => $q->param('source_port')],
-            [$self->localise('DESTINATION_PORT')
+            [$self->localise('LABEL_DESTINATION_PORT')
                 => $q->param('destination_port') || '&nbsp;'],
-            [$self->localise('DESTINATION_HOST')
+            [$self->localise('LABEL_DESTINATION_HOST')
                 => $dhost],
         )
     {
1	bytegw	1.1	diff -Nur -x '.orig' -x '.rej' e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding mezzanine_patched_e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding
2			--- e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding 2005-03-18 13:31:36.000000000 +1100
3			+++ mezzanine_patched_e-smith-portforwarding-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/portforwarding 2008-02-10 10:13:32.000000000 +1100
4			@@ -124,22 +124,6 @@
5			<trans>Remove</trans>
6			</entry>
7			<entry>
8			- <base>SOURCE_PORT</base>
9			- <trans>Source Port(s)</trans>
10			- </entry>
11			- <entry>
12			- <base>DESTINATION_HOST</base>
13			- <trans>Destination Host IP Address</trans>
14			- </entry>
15			- <entry>
16			- <base>DESTINATION_PORT</base>
17			- <trans>Destination Port(s)</trans>
18			- </entry>
19			- <entry>
20			- <base>PROTOCOL</base>
21			- <trans>Protocol</trans>
22			- </entry>
23			- <entry>
24			<base>ERR_NO_MASQ_RECORD</base>
25			<trans>Cannot retrieve masq record from the configuration
26			database.</trans>
27			diff -Nur -x '.orig' -x '.rej' e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm mezzanine_patched_e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm
28			--- e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm 2008-02-10 10:17:13.000000000 +1100
29			+++ mezzanine_patched_e-smith-portforwarding-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/portforwarding.pm 2008-02-10 10:14:30.000000000 +1100
30			@@ -142,22 +142,22 @@
31			print $q->Tr(
32			esmith::cgi::genSmallCell(
33			$q,
34			- $self->localise('PROTOCOL'),
35			+ $self->localise('LABEL_PROTOCOL'),
36			"header"
37			), " ",
38			esmith::cgi::genSmallCell(
39			$q,
40			- $self->localise('SOURCE_PORT'),
41			+ $self->localise('LABEL_SOURCE_PORT'),
42			"header"
43			), " ",
44			esmith::cgi::genSmallCell(
45			$q,
46			- $self->localise('DESTINATION_HOST'),
47			+ $self->localise('LABEL_DESTINATION_HOST'),
48			"header"
49			), " ",
50			esmith::cgi::genSmallCell(
51			$q,
52			- $self->localise('DESTINATION_PORT'),
53			+ $self->localise('LABEL_DESTINATION_PORT'),
54			"header",
55			), " ",
56			esmith::cgi::genSmallCell(
57			@@ -486,13 +486,13 @@
58
59			my $dhost = $self->get_destination_host();
60			foreach my $tablearrayref (
61			- [$self->localise('PROTOCOL')
62			+ [$self->localise('LABEL_PROTOCOL')
63			=> $q->param('protocol')],
64			- [$self->localise('SOURCE_PORT')
65			+ [$self->localise('LABEL_SOURCE_PORT')
66			=> $q->param('source_port')],
67			- [$self->localise('DESTINATION_PORT')
68			+ [$self->localise('LABEL_DESTINATION_PORT')
69			=> $q->param('destination_port') \|\| ' '],
70			- [$self->localise('DESTINATION_HOST')
71			+ [$self->localise('LABEL_DESTINATION_HOST')
72			=> $dhost],
73			)
74			{