From d71bae3c642575d667fade0d342f81d2f724e4c9 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 22 Aug 2012 07:26:25 -0400 Subject: [PATCH] Added code to remove the domain module to the installer. --- install/lib/installer_base.lib.php | 5 +++++ install/dist/lib/fedora.lib.php | 3 +++ install/dist/lib/gentoo.lib.php | 4 ++++ install/dist/lib/opensuse.lib.php | 3 +++ install/sql/incremental/upd_0040.sql | 4 ++++ 5 files changed, 19 insertions(+), 0 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index f4f48c3..1f2e857 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -1056,6 +1056,9 @@ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices')); } + //* Remove Domain module as its functions are available in the client module now + if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); + } public function configure_dbserver() diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 3634b84..b08a05f 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -1038,6 +1038,10 @@ chown('/usr/local/bin/run-getmail.sh', 'getmail'); } chmod('/usr/local/bin/run-getmail.sh', 0744); + + //* Remove Domain module as its functions are available in the client module now + if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); + } } diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 19089ae..f33fc84 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -1098,6 +1098,9 @@ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices')); } + //* Remove Domain module as its functions are available in the client module now + if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); + } diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index dd55a54..9fec158 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1995,6 +1995,11 @@ fclose($fh); */ } + + //* Remove Domain module as its functions are available in the client module now + if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); + + } public function configure_dbserver() { diff --git a/install/sql/incremental/upd_0040.sql b/install/sql/incremental/upd_0040.sql new file mode 100644 index 0000000..d613681 --- /dev/null +++ b/install/sql/incremental/upd_0040.sql @@ -0,0 +1,4 @@ + +-- Removal of the domain module +UPDATE sys_user SET startmodule = 'dashboard' WHERE startmodule = 'domain'; +UPDATE sys_user SET modules = replace(modules, ',domain', '') WHERE modules like '%domain%'; -- Gitblit v1.9.1