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

diverse fixes in installer and user form.

parent a9a11217
...@@ -386,14 +386,15 @@ postfix check ...@@ -386,14 +386,15 @@ postfix check
// amavisd user config file // amavisd user config file
$configfile = 'amavisd_user_config'; $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"].'/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"].'/50-user~')) exec('chmod 400 '.$conf["dist_amavis_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 = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf["mysql_server_ispconfig_user"],$content); $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_ispconfig_password}',$conf["mysql_server_ispconfig_password"],$content);
$content = str_replace('{mysql_server_database}',$conf["mysql_server_database"],$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); $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 // TODO: chmod and chown on the config file
......
...@@ -239,7 +239,7 @@ $form["tabs"]['users'] = array ( ...@@ -239,7 +239,7 @@ $form["tabs"]['users'] = array (
################################## ##################################
) )
); );
/*
$form["tabs"]['address'] = array ( $form["tabs"]['address'] = array (
'title' => "Address", 'title' => "Address",
'width' => 80, 'width' => 80,
...@@ -397,6 +397,7 @@ $form["tabs"]['address'] = array ( ...@@ -397,6 +397,7 @@ $form["tabs"]['address'] = array (
################################## ##################################
) )
); );
*/
$form["tabs"]['groups'] = array ( $form["tabs"]['groups'] = array (
'title' => "Groups", 'title' => "Groups",
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML> <HTML>
<HEAD> <HEAD>
<TITLE>42go Hilfe</TITLE> <TITLE>ISPConfig Help</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1"> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1">
</HEAD> </HEAD>
<BODY BGCOLOR="#FFFFFF"> <BODY BGCOLOR="#FFFFFF">
<div align="center"> <div align="center">
<p>&nbsp;</p> <p>&nbsp;</p>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>&nbsp;</p> <p>&nbsp;</p>
<p>ONLINE HILFE&nbsp; <p>&nbsp;
</p> </p>
</div> </div>
</BODY> </BODY>
</HTML> </HTML>
\ No newline at end of file
...@@ -112,7 +112,7 @@ $form["tabs"]['users'] = array ( ...@@ -112,7 +112,7 @@ $form["tabs"]['users'] = array (
'datatype' => 'VARCHAR', 'datatype' => 'VARCHAR',
'formtype' => 'SELECT', 'formtype' => 'SELECT',
'default' => 'Y', 'default' => 'Y',
'value' => array('N' => 'No','Y' => 'Yes') 'value' => array('Y' => 'Yes','N' => 'No')
), ),
################################## ##################################
......
Supports Markdown
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