Commit fb3a98c0 authored by tbrehm's avatar tbrehm
Browse files

Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)

parent 4b88c2b9
......@@ -145,7 +145,10 @@ apt-get -y install bind9 dnsutils
6) Install vlogger and webalizer
apt-get -y install vlogger webalizer
apt-get -y install vlogger webalizer awstats
mkdir /usr/share/awstats/tools
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
......
......@@ -28,7 +28,10 @@ STANDALONE_OR_INETD=standalone
VIRTUALCHROOT=true
[...]
apt-get install vlogger webalizer
apt-get install vlogger webalizer awstats
mkdir /usr/share/awstats/tools
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
apt-get install gcc make
......
......@@ -263,7 +263,10 @@ update-rc.d mydns defaults
6) Install vlogger and webalizer
apt-get -y install vlogger webalizer
apt-get -y install vlogger webalizer awstats
mkdir /usr/share/awstats/tools
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
......
......@@ -139,7 +139,10 @@ apt-get -y install bind9 dnsutils
6) Install vlogger and webalizer
apt-get -y install vlogger webalizer
apt-get -y install vlogger webalizer awstats
mkdir /usr/share/awstats/tools
cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl
7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
......
......@@ -64,6 +64,11 @@ then execute:
mkdir -p /var/run/clamav
ln -s /var/lib/clamav/clamd-socket /var/run/clamav/clamd
# On 64Bit systems, run this command to symlink the dovecot library folder. Thats for 64Bit systems only, so do not exekute the ln command on 32bit systems.
ln -s /usr/lib64/dovecot/modules /usr/lib/dovecot
chkconfig --add amavis
chkconfig --add clamd
/etc/init.d/amavis start
......
......@@ -35,7 +35,7 @@ class installer extends installer_dist {
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
$content = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
......
......@@ -35,7 +35,7 @@ class installer extends installer_dist {
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
$content = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
......
......@@ -345,7 +345,7 @@ class installer_dist extends installer_base {
// amavisd user config file
$configfile = 'fedora_amavisd_conf';
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
$content = rf("tpl/".$configfile.".master");
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
......@@ -529,7 +529,7 @@ class installer_dist extends installer_base {
// copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
$content = rf("tpl/apache_ispconfig.conf.master");
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
if(count($records) > 0) {
if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
......@@ -579,7 +579,7 @@ class installer_dist extends installer_base {
$tcp_public_services = '';
$udp_public_services = '';
$row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id']));
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
$tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"]));
......@@ -698,6 +698,13 @@ class installer_dist extends installer_base {
wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because
// the value is a autoinc-value and so changed by the remoteaction_core_module
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
}
//* Enable the server modules and plugins.
// TODO: Implement a selector which modules and plugins shall be enabled.
......
......@@ -670,14 +670,14 @@ class installer extends installer_base
//* Create the config file for ISPConfig server
$this->write_config_file("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because
//* the value is a autoinc-value and so changed by the remoteaction_core_module
//* Create the config file for remote-actions (but only, if it does not exist, because
// the value is a autoinc-value and so changed by the remoteaction_core_module
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
$this->write_config_file("$install_dir/server/lib/remote_action.inc.php", $content);
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
}
//* Enable the server modules and plugins.
// Enable the server modules and plugins.
// TODO: Implement a selector which modules and plugins shall be enabled.
$dir = $install_dir.'/server/mods-available/';
if (is_dir($dir)) {
......
......@@ -541,7 +541,7 @@ class installer_dist extends installer_base {
//copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
$content = rf("tpl/apache_ispconfig.conf.master");
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
if(count($records) > 0) {
if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
......@@ -591,7 +591,7 @@ class installer_dist extends installer_base {
$tcp_public_services = '';
$udp_public_services = '';
$row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id']));
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){
$tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"]));
......@@ -710,6 +710,12 @@ class installer_dist extends installer_base {
wf("$install_dir/server/lib/$configfile", $content);
//* Create the config file for remote-actions (but only, if it does not exist, because
// the value is a autoinc-value and so changed by the remoteaction_core_module
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
}
//* Enable the server modules and plugins.
// TODO: Implement a selector which modules and plugins shall be enabled.
......
......@@ -161,6 +161,12 @@ function get_distname() {
$distid = 'centos53';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 5.3 or compatible\n");
} elseif(stristr($content,'CentOS release 5')) {
$distname = 'CentOS';
$distver = 'Unknown';
$distid = 'centos53';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 5 or compatible\n");
} else {
$distname = 'Redhat';
$distver = 'Unknown';
......
......@@ -292,6 +292,8 @@ class installer_base {
* 1) it is a single server
* 2) it is the MASTER of n clients
*/
$hosts = array();
if($conf['mysql']['master_slave_setup'] == 'y') {
/*
* it is a master-slave - Setup so the slave has to grant its rights in the master
......@@ -326,7 +328,7 @@ class installer_base {
}
}
if(is_array($hosts)) {
if(count($hosts) > 0) {
foreach($hosts as $host => $value) {
/*
* If a pwd exists, this means, we have to add the new user (and his pwd).
......@@ -711,11 +713,11 @@ class installer_base {
$config_dir = $conf['dovecot']['config_dir'];
//* Configure master.cf and add a line for deliver
if(is_file($config_dir.'/master.cf')) {
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
if(is_file($conf['postfix']['config_dir'].'/master.cf')) {
copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~2');
}
if(is_file($config_dir.'/master.cf~')) {
chmod($config_dir.'/master.cf~2', 0400);
if(is_file($conf['postfix']['config_dir'].'/master.cf~')) {
chmod($conf['postfix']['config_dir'].'/master.cf~2', 0400);
}
$content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before
......@@ -1058,7 +1060,7 @@ class installer_base {
$tcp_public_services = '';
$udp_public_services = '';
$row = $this->db->queryOneRecord('SELECT * FROM firewall WHERE server_id = '.intval($conf['server_id']));
$row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id']));
if(trim($row['tcp_port']) != '' || trim($row['udp_port']) != '') {
$tcp_public_services = trim(str_replace(',',' ',$row['tcp_port']));
......
CREATE TABLE `sys_session` (
CREATE TABLE IF NOT EXISTS `sys_session` (
`session_id` varchar(32) NOT NULL default '',
`date_created` datetime NOT NULL default '0000-00-00 00:00:00',
`last_updated` datetime NOT NULL default '0000-00-00 00:00:00',
......
......@@ -55,8 +55,6 @@ plugin {
#auth_executable = /usr/lib/dovecot/dovecot-auth
auth default {
mechanisms = plain login
passdb pam {
}
# SQL database <doc/wiki/AuthDatabase.SQL.txt>
passdb sql {
......
......@@ -847,7 +847,7 @@ auth default {
# database (passwd usually), you can use static userdb.
# REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
# authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
passdb pam {
# passdb pam {
# [blocking=yes] [session=yes] [setcred=yes]
# [cache_key=<key>] [<service name>]
#
......@@ -880,7 +880,7 @@ auth default {
# args = session=yes *
# args = cache_key=%u dovecot
#args = dovecot
}
# }
# System users (NSS, /etc/passwd, or similiar)
# In many systems nowadays this uses Name Service Switch, which is
......
......@@ -198,7 +198,7 @@ updateDbAndIni();
* (if this is done at client side, only this client is updated.
* If this is done at server side, all clients are updated.
*/
//if($conf['mysql']['master_slave_setup'] == 'y') {
//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') {
//** Update master database rights
$reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');
......
......@@ -483,7 +483,7 @@ class db {
public function tableInfo($table_name) {
//* Tabellenfelder einlesen ?
if($rows = $this->queryAllRecords('SHOW FIELDS FROM $table_name')){
if($rows = $this->queryAllRecords('SHOW FIELDS FROM '.$table_name)){
foreach($rows as $row) {
$name = $row['Field'];
$default = $row['Default'];
......
......@@ -33,6 +33,7 @@ $wb['top_menu_help'] = 'Help';
$wb['top_menu_billing'] = 'Billing';
$wb['top_menu_domain'] = 'Domains';
$wb['top_menu_dashboard'] = 'Home';
$wb['top_menu_vm'] = 'VM';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['latest_news_txt'] = 'Latest news';
?>
<?php
$wb['conf_format_dateshort'] = 'Y-m-d';
$wb['conf_format_datelong'] = 'l d F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
$wb['conf_format_datetime'] = 'Y-m-d H:i';
$wb['301'] = 'Module niet toegestaan voor de huidige gebruiker.';
$wb['302'] = 'Ongeldige module.';
$wb['1001'] = 'De gebruikersnaam en wachtwoord kunnen niet leeg zijn!';
$wb['1002'] = 'De gebruikersnaam en/of wachtwoord zijn onjuist!';
$wb['1003'] = 'De gebruikersnaam wordt gedeactiveerd!';
$wb['delete_confirmation'] = 'Wilt u dit record echt verwijderen?';
$wb['error_no_view_permission'] = 'U heeft geen toestemming om dit record te bekijken of dit record bestaat niet!';
$wb['error_no_delete_permission'] = 'U heeft geen toestemming om dit record te verwijderen!';
$wb['page_txt'] = 'Pagina';
$wb['page_of_txt'] = 'van';
$wb['page_next_txt'] = 'Volgende';
$wb['page_back_txt'] = 'Vorige';
$wb['delete_txt'] = 'Verwijderen';
$wb['filter_txt'] = 'Filteren';
$wb['add_new_record_txt'] = 'Toevoegen';
$wb['btn_save_txt'] = 'Opslaan';
$wb['btn_cancel_txt'] = 'Annuleren';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['page_and_txt'] = 'en';
$wb['top_menu_system'] = 'Systeem';
$wb['top_menu_client'] = 'Klanten';
$wb['top_menu_email'] = 'E-mail';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Websites';
$wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Extra';
$wb['top_menu_help'] = 'Help';
$wb['top_menu_billing'] = 'Billing';
$wb['top_menu_domain'] = 'Domains';
$wb['top_menu_dashboard'] = 'Home';
$wb['latest_news_txt'] = 'Latest news';
?>
<?php
$wb['conf_format_dateshort'] = 'Y-m-d';
$wb['conf_format_datelong'] = 'l d F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
$wb['conf_format_datetime'] = 'Y-m-d H:i';
$wb['301'] = 'Module niet toegestaan voor de huidige gebruiker.';
$wb['302'] = 'Ongeldige module.';
$wb['1001'] = 'De gebruikersnaam en wachtwoord kunnen niet leeg zijn!';
$wb['1002'] = 'De gebruikersnaam en/of wachtwoord zijn onjuist!';
$wb['1003'] = 'De gebruikersnaam wordt gedeactiveerd!';
$wb['delete_confirmation'] = 'Wilt u dit record echt verwijderen?';
$wb['error_no_view_permission'] = 'U heeft geen toestemming om dit record te bekijken of dit record bestaat niet!';
$wb['error_no_delete_permission'] = 'U heeft geen toestemming om dit record te verwijderen!';
$wb['page_txt'] = 'Pagina';
$wb['page_of_txt'] = 'van';
$wb['page_next_txt'] = 'Volgende';
$wb['page_back_txt'] = 'Vorige';
$wb['delete_txt'] = 'Verwijderen';
$wb['filter_txt'] = 'Filteren';
$wb['add_new_record_txt'] = 'Toevoegen';
$wb['btn_save_txt'] = 'Opslaan';
$wb['btn_cancel_txt'] = 'Annuleren';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['page_and_txt'] = 'en';
$wb['top_menu_system'] = 'Systeem';
$wb['top_menu_client'] = 'Klanten';
$wb['top_menu_email'] = 'E-mail';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Websites';
$wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Extra';
$wb['top_menu_help'] = 'Help';
$wb['top_menu_billing'] = 'Facturen';
$wb['top_menu_domain'] = 'Domeinen';
$wb['top_menu_dashboard'] = 'Home';
$wb['latest_news_txt'] = 'Laatste nieuws';
?>
<?php
$wb['conf_format_dateshort'] = 'Y-m-d';
$wb['conf_format_datelong'] = 'l dS of F Y';
$wb['conf_format_timeshort'] = 'H:i';
$wb['conf_format_timelong'] = 'H:i:s';
$wb['conf_format_datetime'] = 'Y-m-d H:i';
$wb['301'] = 'Moduł nie jest dostępny dla aktualnego uzytkownika.';
$wb['302'] = 'Moduł jest niepoprawny.';
$wb['1001'] = 'Nazwa użytkownika i hasło nie może być puste !';
$wb['1002'] = 'Nazwa użytkownika i/lub hasło nie są poprawne !';
$wb['1003'] = 'Nazwa użytkownika nie jest aktywna!';
$wb['delete_confirmation'] = 'Jesteś pewny, że chcesz usunąć ten wpis?';
$wb['error_no_view_permission'] = 'Nie masz uprawnień do podglądu tego wpisu lub taki wpis nie istnieje!';
$wb['error_no_delete_permission'] = 'Nie masz uprawnień do usunięcia tego wpisu!';
$wb['page_txt'] = 'Strona';
$wb['page_of_txt'] = 'z';
$wb['page_next_txt'] = 'Następna';
$wb['page_back_txt'] = 'Wróć';
$wb['delete_txt'] = 'Usuń';
$wb['filter_txt'] = 'Filtr';
$wb['add_new_record_txt'] = 'Dodaj nowy wpis';
$wb['btn_save_txt'] = 'Zapisz';
$wb['btn_cancel_txt'] = 'Wróć';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['page_and_txt'] = 'and';
$wb['top_menu_system'] = 'System';
$wb['top_menu_client'] = 'Client';
$wb['top_menu_email'] = 'Email';
$wb['top_menu_monitor'] = 'Monitor';
$wb['top_menu_sites'] = 'Sites';
$wb['top_menu_dns'] = 'DNS';
$wb['top_menu_tools'] = 'Tools';
$wb['top_menu_help'] = 'Help';
$wb['top_menu_billing'] = 'Billing';
$wb['top_menu_domain'] = 'Domains';
$wb['top_menu_dashboard'] = 'Home';
$wb['latest_news_txt'] = 'Latest news';
?>
<?php
$wb['conf_format_dateshort'] = "Y-m-d";
$wb['conf_format_datelong'] = "l dS of F Y";
$wb['conf_format_timeshort'] = "H:i";
$wb['conf_format_timelong'] = "H:i:s";
$wb['conf_format_datetime'] = "Y-m-d H:i";
$wb['301'] = "Moduł nie jest dostępny dla aktualnego uzytkownika.";
$wb['302'] = "Moduł jest niepoprawny.";
$wb['1001'] = "Nazwa użytkownika i hasło nie może być puste !";
$wb['1002'] = "Nazwa użytkownika i/lub hasło nie są poprawne !";
$wb['1003'] = "Nazwa użytkownika nie jest aktywna!";
$wb['delete_confirmation'] = "Jesteś pewny, że chcesz usunąć ten wpis?";
$wb['error_no_view_permission'] = "Nie masz uprawnień do podglądu tego wpisu lub taki wpis nie istnieje!";
$wb['error_no_delete_permission'] = "Nie masz uprawnień do usunięcia tego wpisu!";
$wb['page_txt'] = "Strona";
$wb['page_of_txt'] = "z";
$wb['page_next_txt'] = "Następna";
$wb['page_back_txt'] = "Wróć";
$wb['delete_txt'] = "Usuń";
$wb['filter_txt'] = "Filtr";
$wb['add_new_record_txt'] = "Dodaj nowy wpis";
$wb['btn_save_txt'] = "Zapisz";
$wb['btn_cancel_txt'] = "Wróć";
$wb['toolsarea_head_txt'] = "Narzędzia";
$wb['page_and_txt'] = "i";
$wb['top_menu_system'] = "System";
$wb['top_menu_client'] = "Klient";
$wb['top_menu_email'] = "E-mail";
$wb['top_menu_monitor'] = "Monitor";
$wb['top_menu_sites'] = "Strony";
$wb['top_menu_dns'] = "DNS";
$wb['top_menu_tools'] = "Narzędzia";
$wb['top_menu_help'] = "Pomoc";
$wb['top_menu_billing'] = "Biling";
$wb['top_menu_domain'] = "Domeny";
$wb['top_menu_dashboard'] = "Strona główna";
$wb['latest_news_txt'] = "Ostatnie wiadomości";
?>
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