Commit 8fe9ab67 authored by tbrehm's avatar tbrehm
Browse files

Fixed PHP notices in mailman installer.

parent deff20f9
...@@ -523,9 +523,9 @@ class installer_base { ...@@ -523,9 +523,9 @@ class installer_base {
$lines = explode("\n", $old_file); $lines = explode("\n", $old_file);
foreach ($lines as $line) foreach ($lines as $line)
{ {
if (strlen($line) && substr($line, 0, 1) != '#') if (trim($line) != '' && substr($line, 0, 1) != '#')
{ {
list($key, $value) = explode("=", $line); @list($key, $value) = @explode("=", $line);
if (!empty($value)) if (!empty($value))
{ {
$key = rtrim($key); $key = rtrim($key);
...@@ -540,6 +540,7 @@ class installer_base { ...@@ -540,6 +540,7 @@ class installer_base {
// create virtual_domains list // create virtual_domains list
$domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain"); $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");
if(is_array($domainAll)) {
foreach($domainAll as $domain) foreach($domainAll as $domain)
{ {
if ($domainAll[0]['domain'] == $domain['domain']) if ($domainAll[0]['domain'] == $domain['domain'])
...@@ -547,6 +548,7 @@ class installer_base { ...@@ -547,6 +548,7 @@ class installer_base {
else else
$virtual_domains .= ", '".$domain['domain']."'"; $virtual_domains .= ", '".$domain['domain']."'";
} }
}
} }
else else
$virtual_domains = "' '"; $virtual_domains = "' '";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment