From 14150027a166de379bd61ba3f15ac8c8a92524d5 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 18 Sep 2015 01:54:15 -0400
Subject: [PATCH] update mail_mail_domain_plugin.inc.php
---
install/lib/installer_base.lib.php | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 3f54fc8..c333a5e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -164,16 +164,30 @@
if ($conf['services']['web'] && (($conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) || ($conf['nginx']['installed'] && is_file($conf['nginx']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")))) $this->ispconfig_interface_installed = true;
}
- public function force_configure_app($service) {
+ public function force_configure_app($service, $enable_force=true) {
$force = false;
swriteln("[WARN] autodetect for $service failed");
- if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
-// swriteln("Configure $service");
- $force = true;
- } else swriteln("Skipping $service\n");
+ if($enable_force) {
+ if(strtolower($this->simple_query("Force configure $service", array('y', 'n'), 'n') ) == 'y') {
+ $force = true;
+ } else swriteln("Skipping $service\n");
+ }
return $force;
}
+ public function reconfigure_app($service, $reconfigure_services_answer) {
+ $reconfigure = false;
+ if ($reconfigure_services_answer != 'selected') {
+ $reconfigure = true;
+ } else {
+ if(strtolower($this->simple_query("Reconfigure $service", array('y', 'n'), 'y') ) == 'y') {
+ $reconfigure = true;
+ } else {
+ swriteln("Skip reconfigure $service\n");
+ }
+ }
+ return $reconfigure;
+ }
/** Create the database for ISPConfig */
@@ -332,7 +346,7 @@
$conf['server_id'] = $conf['server_id'];
//* Insert the same record in the local DB
- $sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);";
+ $sql = "INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`, `dbversion`,`firewall_server`,`proxy_server`) VALUES (?,1, 1, 'riud', 'riud', 'r', ?, ?, ?, ?, ?, ?, ?, ?, 0, 1, ?, ?, ?);";
$this->db->query($sql, $conf['server_id'], $conf['hostname'], $mail_server_enabled, $web_server_enabled, $dns_server_enabled, $file_server_enabled, $db_server_enabled, $vserver_server_enabled, $server_ini_content, $current_db_version, $proxy_server_enabled, $firewall_server_enabled);
//* username for the ispconfig user
--
Gitblit v1.9.1