Skip to content

GitLab

Commit 5f0f02aa authored by tbrehm's avatar tbrehm
Browse files

diverse fixes in installer and user form.

parent a9a11217
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 21 deletions
install/lib/installer_base.lib.php
View file @ 5f0f02aa
......@@ -386,14 +386,15 @@ postfix check
// amavisd user config file
$configfile = 'amavisd_user_config';
if(is_file($conf["dist_amavis_config_dir"].'/50-user')) copy($conf["dist_amavis_config_dir"].'/50-user',$conf["dist_courier_config_dir"].'/50-user~');
if(is_file($conf["dist_amavis_config_dir"].'/50-user~')) exec('chmod 400 '.$conf["dist_amavis_config_dir"].'/50-user~');
if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user')) copy($conf["dist_amavis_config_dir"].'/conf.d/50-user',$conf["dist_courier_config_dir"].'/50-user~');
if(is_file($conf["dist_amavis_config_dir"].'/conf.d/50-user~')) exec('chmod 400 '.$conf["dist_amavis_config_dir"].'/conf.d/50-user~');
$content = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content);
$content = str_replace('{mysql_server_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
$content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$content);
$content = str_replace('{mysql_server_port}',$conf["mysql_server_port"],$content);
$content = str_replace('{mysql_server_ip}',$conf["mysql_server_ip"],$content);
wf($conf["dist_amavis_config_dir"].'/50-user',$content);
wf($conf["dist_amavis_config_dir"].'/conf.d/50-user',$content);
// TODO: chmod and chown on the config file
......
interface/web/admin/form/users.tform.php
View file @ 5f0f02aa
......@@ -239,7 +239,7 @@ $form["tabs"]['users'] = array (
##################################
)
);
/*
$form["tabs"]['address'] = array (
'title' => "Address",
'width' => 80,
......@@ -397,6 +397,7 @@ $form["tabs"]['address'] = array (
##################################
)
);
*/
$form["tabs"]['groups'] = array (
'title' => "Groups",
......
interface/web/help/index.php
View file @ 5f0f02aa
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
<TITLE>42go Hilfe</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1">
</HEAD>
<BODY BGCOLOR="#FFFFFF">
<div align="center">
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>ONLINE HILFE&nbsp;
</p>
</div>
</BODY>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<HEAD>
<TITLE>ISPConfig Help</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1">
</HEAD>
<BODY BGCOLOR="#FFFFFF">
<div align="center">
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;
</p>
</div>
</BODY>
</HTML>
\ No newline at end of file
interface/web/mail/form/spamfilter_users.tform.php
View file @ 5f0f02aa
......@@ -112,7 +112,7 @@ $form["tabs"]['users'] = array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => 'Y',
'value' => array('N' => 'No','Y' => 'Yes')
'value' => array('Y' => 'Yes','N' => 'No')
),
##################################
......
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