bless directly the wizard object instead of wrapping it in a hash

20 files changed, 24 insertions, 62 deletions

diff --git a/client_wizard/Bind_client.pm b/client_wizard/Bind_client.pm
index 81456894..b70e00eb 100755
--- a/client_wizard/Bind_client.pm
+++ b/client_wizard/Bind_client.pm
@@ -186,9 +186,7 @@ sub do_it {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 1;
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm
index 7b8f3665..63e5b09a 100755
--- a/dhcp_wizard/Dhcp.pm
+++ b/dhcp_wizard/Dhcp.pm
@@ -275,10 +275,8 @@ mask = $wiz_ip_netmask, rng1 = $wiz_ip_range1, rng2 = $wiz_ip_range2, dname = $w
 }
 
 sub new {
-    my ($class, $conf) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    my ($class) = @_;
+    bless $o, $class;
 }
 
 1;
diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm
index 2e156c51..e9316fa0 100644
--- a/dns_wizard/Bind.pm
+++ b/dns_wizard/Bind.pm
@@ -803,9 +803,7 @@ sub do_it_list {
 
 sub new {
     my ($class) = @_;
-    bless {
-            o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 1;
diff --git a/drakwizard.pl b/drakwizard.pl
index df20ec4b..4b52d0a4 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -87,11 +87,11 @@ if ($err) {
 }
 
 $::in = $in;
-if ($wiz->{o}{use_new_data_structure}) {
-    my $wizard = wizards->new($wiz->{o});
+if ($wiz->{use_new_data_structure}) {
+    my $wizard = wizards->new($wiz);
     $wizard->safe_process($in);
 } else {
-    wizard($wiz->{o});
+    wizard($wiz);
 }
 $in->exit;
 
diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index b960074c..9ac8aaed 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -180,9 +180,7 @@ $o->{pages} = {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 sub true {
diff --git a/installsrv_wizard/Installsrv.pm b/installsrv_wizard/Installsrv.pm
index ce00a274..e4b44cda 100644
--- a/installsrv_wizard/Installsrv.pm
+++ b/installsrv_wizard/Installsrv.pm
@@ -162,9 +162,7 @@ sub do_it {
 
 sub new {
     my ($class) = @_;
-    bless {
-            o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 1;
diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm
index 3a5c0414..886d0146 100755
--- a/kolab_wizard/Kolab.pm
+++ b/kolab_wizard/Kolab.pm
@@ -225,9 +225,7 @@ $o->{pages} = {
 
 sub new {
   my ($class) = @_;
-  bless {
-	 o   => $o,
-	}, $class;
+  bless $o, $class;
 }
 
 sub do_it_master_withoutca {
diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm
index f447d5bf..5a9f7386 100644
--- a/ldap_wizard/Ldap.pm
+++ b/ldap_wizard/Ldap.pm
@@ -431,9 +431,7 @@ sub sav_conf {
 
 sub new {
   my ($class) = @_;
-  bless {
-	 o   => $o,
-	}, $class;
+  bless $o, $class;
 }
 
 1;
diff --git a/news_wizard/Inn.pm b/news_wizard/Inn.pm
index 6ad5ec83..364f1a7b 100755
--- a/news_wizard/Inn.pm
+++ b/news_wizard/Inn.pm
@@ -100,9 +100,7 @@ $o->{pages} = {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 sub check_valid_hours {
diff --git a/nfs_wizard/NFS.pm b/nfs_wizard/NFS.pm
index ff46f11d..89193bd9 100755
--- a/nfs_wizard/NFS.pm
+++ b/nfs_wizard/NFS.pm
@@ -115,9 +115,7 @@ $o->{pages} = {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 sub network_mask {
diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm
index 0f9229e6..52f27c2a 100644
--- a/nisautofs_wizard/Nisautofs.pm
+++ b/nisautofs_wizard/Nisautofs.pm
@@ -300,9 +300,7 @@ sub do_it_server {
 
 sub new {
     my ($class) = @_;
-    bless {
-            o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 1;
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
index 75edee65..e443aa1c 100755
--- a/postfix_wizard/Postfix.pm
+++ b/postfix_wizard/Postfix.pm
@@ -283,10 +283,8 @@ $o->{pages} = {
 };
 
 sub new {
-    my ($class, $_conf) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    my ($class) = @_;
+    bless $o, $class;
 }
 
 sub check_sendmail {
diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm
index 118fa18e..4848b428 100755
--- a/proxy_wizard/Squid.pm
+++ b/proxy_wizard/Squid.pm
@@ -192,9 +192,7 @@ $o->{pages} = {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 sub network_mask {
diff --git a/pxe_wizard/Pxe.pm b/pxe_wizard/Pxe.pm
index 89d8dab6..2bcfb4a7 100644
--- a/pxe_wizard/Pxe.pm
+++ b/pxe_wizard/Pxe.pm
@@ -643,9 +643,7 @@ EOF
 
 sub new {
     my ($class) = @_;
-    bless {
-            o   => $o,
-	   }, $class;
+    bless $o, $class;
 }
 
 1;
diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index c827324f..85a84fda 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -364,9 +364,7 @@ $o->{pages} = {
 
 sub new {
   my ($class, $conf) = @_;
-  bless {
-	 o   => $o,
-	}, $class;
+  bless $o, $class;
 }
 
 sub check() {
diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm
index abe214ad..01f8622a 100755
--- a/samba_wizard/Sambaprint.pm
+++ b/samba_wizard/Sambaprint.pm
@@ -160,9 +160,7 @@ $o->{pages} = {
 
 sub new {
   my ($class, $conf) = @_;
-  bless {
-	 o   => $o,
-	}, $class;
+  bless $o, $class;
 }
 
 sub check() {
diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm
index 9430ef44..54345fde 100755
--- a/samba_wizard/Sambashare.pm
+++ b/samba_wizard/Sambashare.pm
@@ -691,9 +691,7 @@ $o->{pages} = {
 
 sub new {
   my ($class, $conf) = @_;
-  bless {
-	 o   => $o,
-	}, $class;
+  bless $o, $class;
 }
 
 sub check() {
diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm
index 3e35b7b4..2b60d415 100755
--- a/sshd_wizard/Sshd.pm
+++ b/sshd_wizard/Sshd.pm
@@ -202,9 +202,7 @@ $o->{pages} = {
 
 sub new {
   my ($class, $conf) = @_;
-  bless {
-         o   => $o,
-        }, $class;
+  bless $o, $class;
 }
 
 sub write_conf_restart_ssh {
diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index fc97185c..1772f9c0 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -162,9 +162,7 @@ $o->{pages} = {
 
 sub new {
     my ($class) = @_;
-    bless {
-	    o   => $o,
-       }, $class;
+    bless $o, $class;
 }
 
 sub get_timezone {
diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm
index 845d8e8c..dcb68dc8 100755
--- a/web_wizard/Apache.pm
+++ b/web_wizard/Apache.pm
@@ -171,9 +171,7 @@ sub new {
 #	$o->{needed_rpm} = [ 'apache-1.3' ];
 #	$o->{var}{servicecheck} = 'httpd';
 #    }
-    bless {
-	o   => $o,
-    }, $class;
+    bless $o, $class;
 }
 
 sub chg_docroot {