fix fixed_val and fixed_list

1 files changed, 13 insertions, 14 deletions

diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index e9316fa0..75d99b53 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -66,7 +66,6 @@ my $o = {
 		 CLIENTNAME => '',
 		 CLIENTIP => $CLIENTIP,
 		},
-	 defaultimage => "/usr/share/wizards//dns_wizard/images/DNS.png",
 	 init => sub {
 	   test_host_domain($SHORTHOSTNAME, $DOMAINNAME);
 	 },
@@ -127,8 +126,8 @@ $o->{pages} = {
 	       addhost => {
 			   name => N("Client identification:") . "\n\n" . N("Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax.") . "\n\n" . N("(You don't need to add the domain after the name)") . "\n\n" . N("Note that the given IP address and client name should be unique in the network."),
 			   data => [
-				    { label => N("Server:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				    { label => N("DNS Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
+				    { label => N("Server:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				    { label => N("DNS Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
 				    { label => N("Name of the machine:"), val => \$o->{var}{CLIENTNAME} },
 				    { label => N("IP address of the machine:"), val => \$o->{var}{CLIENTIP} },
 				   ],
@@ -138,7 +137,7 @@ $o->{pages} = {
 	       removehost => {
 			      name => N("Remove host:") . "\n\n" . N("Remove a host in existing DNS configuration.") . "\n\n" . N("Choose the host you want to remove in the following list."),
 			      data => [
-				       { label => N("Computer Name:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts },
+				       { label => N("Computer Name:"), val => \$o->{var}{CLIENTNAME}, list_ref => \@list_hosts },
 				      ],
 			      post => \&list_hosts,
 			      next => 'summaryremove', no_back => 1,
@@ -215,7 +214,7 @@ $o->{pages} = {
 	       summaryslave => {
 				name => N("Wizard will Now build your DNS slave configuration") . "\n\n" . N("with this configuration:"),
 				data => [
-					 { label => N("IP Address of the master DNS server:"), fixed_val => \$o->{var}{IPMASTER} },
+					 { label => N("IP Address of the master DNS server:"), val_ref => \$o->{var}{IPMASTER} },
 					],
 				post => \&do_it_slave,
 				next => 'end',
@@ -223,10 +222,10 @@ $o->{pages} = {
 	       summaryadd => {
 			      name => N("Client with this identification will be added to your DNS"),
 			      data => [
-				       { label => N("Server:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				       { label => N("DNS Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
-				       { label => N("Computer name:"), fixed_val => \$o->{var}{CLIENTNAME} },
-				       { label => N("Computer IP address:"), fixed_val => \$o->{var}{CLIENTIP} },
+				       { label => N("Server:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				       { label => N("DNS Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
+				       { label => N("Computer name:"), val_ref => \$o->{var}{CLIENTNAME} },
+				       { label => N("Computer IP address:"), val_ref => \$o->{var}{CLIENTIP} },
 				      ],
 			      post => \&do_it_add,
 			      next => 'endadd',
@@ -234,7 +233,7 @@ $o->{pages} = {
 	       summaryremove => {
 				 name => N("Client with this identification will be removed from your DNS"),
 				 data => [
-					  { label => N("Computer name:"), val => \$o->{var}{CLIENTNAME}, fixed_list => \@list_hosts },
+					  { label => N("Computer name:"), val => \$o->{var}{CLIENTNAME}, list_ref => \@list_hosts },
 					 ],
 				 post => \&do_it_remove,
 				 next => 'endremove',
@@ -242,10 +241,10 @@ $o->{pages} = {
 	       summary => {
 			   name => N("The DNS server is about to be configured with the following configuration"),
 			   data => [
-				    { label => N("Server Hostname:"), fixed_val => \$o->{var}{SHORTHOSTNAME} },
-				    { label => N("Domainname:"), fixed_val => \$o->{var}{DOMAINNAME} },
-				    { label => N("External DNS:"), fixed_val => \$o->{var}{IPOFFORWARDER} },
-				    { label => N("Default domain name to search:"), fixed_val => \$o->{var}{ADDSEARCH} },
+				    { label => N("Server Hostname:"), val_ref => \$o->{var}{SHORTHOSTNAME} },
+				    { label => N("Domainname:"), val_ref => \$o->{var}{DOMAINNAME} },
+				    { label => N("External DNS:"), val_ref => \$o->{var}{IPOFFORWARDER} },
+				    { label => N("Default domain name to search:"), val_ref => \$o->{var}{ADDSEARCH} },
 				   ],
 			   post => \&do_it_master,
 			   next => 'end',