From 10fd4fc7f79a5415a6f56c788d7d5c369d5b4049 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Tue, 28 Feb 2012 10:19:05 +0000 Subject: [PATCH] Fixed some php notices. --- install/dist/lib/opensuse.lib.php | 3 ++- install/install.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index db435ee0f..c1d0ce5aa 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -373,8 +373,9 @@ class installer_dist extends installer_base { $configfile = 'dovecot-sql.conf'; if(is_file("$config_dir/$configfile")){ copy("$config_dir/$configfile", "$config_dir/$configfile~"); + exec("chmod 400 $config_dir/$configfile~"); } - exec("chmod 400 $config_dir/$configfile~"); + $content = rf("tpl/opensuse_dovecot-sql.conf.master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); diff --git a/install/install.php b/install/install.php index 46c313e49..a893d157d 100644 --- a/install/install.php +++ b/install/install.php @@ -113,7 +113,7 @@ $install_mode = $inst->simple_query('Installation mode', array('standard','exper //** Get the hostname $tmp_out = array(); exec('hostname -f', $tmp_out); -$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', $tmp_out[0]); +$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg server1.domain.tld ', @$tmp_out[0]); unset($tmp_out); // Check if the mysql functions are loaded in PHP -- GitLab