only show wizards that are installed after drakwizard split

1 files changed, 19 insertions, 22 deletions

diff --git a/control-center b/control-center
index ffe91626..f13f31ee 100755
--- a/control-center
+++ b/control-center
@@ -730,7 +730,7 @@ my %programs =
 
 sub wizard_format {
     map {
-        my ($id, $wizard, $icon, $description, $long_description, $expert_mode) = @$_;
+        my ($id, $wizard, $icon, $description, $long_description, $file, $expert_mode) = @$_;
         $programs{$id} =
           {
            binary => "$sbindir/drakwizard $wizard",
@@ -740,8 +740,7 @@ sub wizard_format {
            icon => $icon,
            expert_mode => $expert_mode,
           };
-        
-        $id;
+        -f top(glob("/usr/lib/perl5/vendor_perl/*/MDK/Wizard/$file")) ? $id : ();
     } @_;
 }
 
@@ -763,28 +762,27 @@ my @tree =
            ]
          ]),
 
-     if_($isWiz,
          if_(0, [ N("Server wizards"), 'wizard-mdk' ]),
          [ N("Sharing"), 'file-sharing-mdk',
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ "FTP wizard",        "proftpd", 'ftp-mdk', N("Configure FTP"),
-                 N("Set up an FTP server"),
+                 N("Set up an FTP server"), 'Proftpd.pm',
                ],
                [ "Samba wizard",      "samba", 'samba_server-mdk', N("Configure Samba"),
-                 N("Set up a file and print server for workstations running Linux and non-Linux systems"),
+                 N("Set up a file and print server for workstations running Linux and non-Linux systems"), 'Samba.pm', 
                ],
                [ "Manage Samba share",    "sambashare", 'wizard-mdk', N("Manage Samba share"),
-                 N("Manage, create special share, create public/user share"), 1,
+                 N("Manage, create special share, create public/user share"), 'Sambashare.pm', 1,
                ],
                [ "Samba printing",    "sambaprint", 'wizard-sambaprint', N("Samba printing configuration"),
-                 N("Enable or disable printers in your Samba server configuration"), 1,
+                 N("Enable or disable printers in your Samba server configuration"), 'Sambaprint.pm', 1,
                ],
                [ "Web wizard",        "apache2", 'web_server-mdk', N("Configure web server"),
-                 N("Set up a web server"),
+                 N("Set up a web server"), 'Apache.pm',
                ],
                [ "Installation server wizard",    "installsrv", 'wizard-mdk', N("Configure installation server"),
-                 N("Set up server for network installations of Mandriva Linux"), 1,
+                 N("Set up server for network installations of Mandriva Linux"), 'Installsrv.pm', 1,
                ],
                ),
             ),
@@ -794,19 +792,19 @@ my @tree =
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ "DHCP wizard",       "dhcp", 'dhcp_server-mdk', N("Configure DHCP"),
-                 N("Set up a DHCP server"),
+                 N("Set up a DHCP server"), 'Dhcp.pm',
                ],
                [ "DNS wizard",        "bind", 'dns_server-mdk', N("Configure DNS"),
-                 N("Set up a DNS server (network name resolution)"),
+                 N("Set up a DNS server (network name resolution)"), 'Bind.pm',
                ],
                [ "Squid wizard",      "squid", 'drakproxy-mdk', N("Configure proxy"),
-                 N("Configure a web caching proxy server"),
+                 N("Configure a web caching proxy server"), 'Squid.pm',
                ],
                [ "Time wizard",       "ntp", 'ntp_server-mdk', N("Configure time"),
-                 N("Set the time of the server to be synchronized with an external time server"),
+                 N("Set the time of the server to be synchronized with an external time server"), 'Ntp.pm',
                ],
                [ "SSHD wizard",       "ntp", 'wizard-sshd', N("OpenSSH daemon configuration"),
-                 N("OpenSSH daemon configuration"),
+                 N("OpenSSH daemon configuration"), 'Sshd.pm',
                ],
                ),
             ),
@@ -817,10 +815,10 @@ my @tree =
             "Authentication",
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ 'Nis+autofs wizard',        "nisautofs",  'nisautofs', N("Configure NIS and Autofs"),
-                 N("Configure the NIS and Autofs services"),
+                 N("Configure the NIS and Autofs services"), 'Nisautofs.pm',
                ],
                [ "LDAP wizard",             "ldap", "ldap-mdk", N("Configure LDAP"),
-                 N("Configure the LDAP directory services"),
+                 N("Configure the LDAP directory services"), 'Ldap.pm',
                ],
                ),
             ),
@@ -830,19 +828,18 @@ my @tree =
            [
             (wizard_format(# [ id, wizard file name, icon, description ]
                [ "News wizard",       "inn", 'news-mdk', N("Configure news"),
-                 N("Configure a newsgroup server"),
+                 N("Configure a newsgroup server"), 'Inn.pm',
                ],
                [ "Kolab wizard",             "kolab", "kolab-mdk", N("Configure groupware"),
-                 N("Configure a groupware server"),
+                 N("Configure a groupware server"), 'Kolab.pm',
                ],
                [ "Postfix wizard",    "postfix", 'postfix-mdk', N("Configure mail"),
-                 N("Configure the Internet Mail services"),
+                 N("Configure the Internet Mail services"), 'Postfix.pm'
                ],
                ),
             ),
            ]
          ],
-            ),
 
      if_($isWebAdmin || $isRfbDrake,
          [ N("Online Administration"), 'online-administration-mdk',
@@ -906,7 +903,7 @@ my @tree =
 
      [ N("System"), 'system-mdk',
        [
-        if_(!$isWiz, "Authentication"),
+        "Authentication",
         "Menus",
         "Display Manager chooser",
         "Services",