From f3ff1e4ba5174dd559890483dd7dded8a04c10fd Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 02 Jul 2015 10:43:28 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/lib/installer_base.lib.php | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f867f04..76e721b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -36,6 +36,7 @@
public $conf;
public $install_ispconfig_interface = true;
public $is_update = false; // true if it is an update, falsi if it is a new install
+ protected $mailman_group = 'list';
public function __construct() {
@@ -179,6 +180,11 @@
public function configure_database() {
global $conf;
+
+ //* check sql-mode
+ $check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode");
+
+ if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') die('Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION');
//** Create the database
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) {
@@ -616,7 +622,7 @@
if (trim($line) != '' && substr($line, 0, 1) != '#')
{
@list($key, $value) = @explode("=", $line);
- if (!empty($value))
+ if (isset($value) && $value !== '')
{
$key = rtrim($key);
$old_options[$key] = trim($value);
@@ -665,14 +671,15 @@
} else {
copy('tpl/mailman-virtual_to_transport.sh', $full_file_name);
}
- chgrp($full_file_name, 'list');
+ chgrp($full_file_name, $this->mailman_group);
chmod($full_file_name, 0755);
}
//* Create aliasaes
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
- if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
+ if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
+ exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
}
public function configure_postfix($options = '') {
--
Gitblit v1.9.1