Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
fb3a98c0
Commit
fb3a98c0
authored
Oct 22, 2010
by
tbrehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merged serveral bugfixes and new language files from stable branch (revisions 2055 - 2093)
parent
4b88c2b9
Changes
319
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
993 additions
and
855 deletions
+993
-855
docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
+4
-1
docs/INSTALL_DEBIAN_5.0_multiserver.txt
docs/INSTALL_DEBIAN_5.0_multiserver.txt
+4
-1
docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
+4
-1
docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
+4
-1
docs/INSTALL_OPENSUSE_11_3.txt
docs/INSTALL_OPENSUSE_11_3.txt
+5
-0
install/dist/lib/centos52.lib.php
install/dist/lib/centos52.lib.php
+1
-1
install/dist/lib/centos53.lib.php
install/dist/lib/centos53.lib.php
+1
-1
install/dist/lib/fedora.lib.php
install/dist/lib/fedora.lib.php
+10
-3
install/dist/lib/gentoo.lib.php
install/dist/lib/gentoo.lib.php
+4
-4
install/dist/lib/opensuse.lib.php
install/dist/lib/opensuse.lib.php
+8
-2
install/lib/install.lib.php
install/lib/install.lib.php
+6
-0
install/lib/installer_base.lib.php
install/lib/installer_base.lib.php
+8
-6
install/sql/incremental/upd_0002.sql
install/sql/incremental/upd_0002.sql
+1
-1
install/tpl/debian6_dovecot.conf.master
install/tpl/debian6_dovecot.conf.master
+0
-2
install/tpl/debian_dovecot.conf.master
install/tpl/debian_dovecot.conf.master
+2
-2
install/update.php
install/update.php
+1
-1
interface/lib/classes/db_mysql.inc.php
interface/lib/classes/db_mysql.inc.php
+1
-1
interface/lib/lang/en.lng
interface/lib/lang/en.lng
+1
-0
interface/lib/lang/nl.lng
interface/lib/lang/nl.lng
+41
-38
interface/lib/lang/pl.lng
interface/lib/lang/pl.lng
+39
-38
interface/web/admin/lib/lang/nl.lng
interface/web/admin/lib/lang/nl.lng
+47
-43
interface/web/admin/lib/lang/nl_firewall.lng
interface/web/admin/lib/lang/nl_firewall.lng
+14
-11
interface/web/admin/lib/lang/nl_firewall_list.lng
interface/web/admin/lib/lang/nl_firewall_list.lng
+10
-8
interface/web/admin/lib/lang/nl_groups.lng
interface/web/admin/lib/lang/nl_groups.lng
+7
-5
interface/web/admin/lib/lang/nl_groups_list.lng
interface/web/admin/lib/lang/nl_groups_list.lng
+9
-7
interface/web/admin/lib/lang/nl_language_add.lng
interface/web/admin/lib/lang/nl_language_add.lng
+10
-8
interface/web/admin/lib/lang/nl_language_complete.lng
interface/web/admin/lib/lang/nl_language_complete.lng
+9
-7
interface/web/admin/lib/lang/nl_language_edit.lng
interface/web/admin/lib/lang/nl_language_edit.lng
+11
-8
interface/web/admin/lib/lang/nl_language_export.lng
interface/web/admin/lib/lang/nl_language_export.lng
+8
-6
interface/web/admin/lib/lang/nl_language_import.lng
interface/web/admin/lib/lang/nl_language_import.lng
+10
-8
interface/web/admin/lib/lang/nl_language_list.lng
interface/web/admin/lib/lang/nl_language_list.lng
+10
-7
interface/web/admin/lib/lang/nl_package_install.lng
interface/web/admin/lib/lang/nl_package_install.lng
+9
-7
interface/web/admin/lib/lang/nl_remote_action.lng
interface/web/admin/lib/lang/nl_remote_action.lng
+13
-10
interface/web/admin/lib/lang/nl_remote_user.lng
interface/web/admin/lib/lang/nl_remote_user.lng
+45
-42
interface/web/admin/lib/lang/nl_remote_user_list.lng
interface/web/admin/lib/lang/nl_remote_user_list.lng
+11
-7
interface/web/admin/lib/lang/nl_server.lng
interface/web/admin/lib/lang/nl_server.lng
+15
-13
interface/web/admin/lib/lang/nl_server_config.lng
interface/web/admin/lib/lang/nl_server_config.lng
+79
-77
interface/web/admin/lib/lang/nl_server_config_list.lng
interface/web/admin/lib/lang/nl_server_config_list.lng
+6
-4
interface/web/admin/lib/lang/nl_server_ip.lng
interface/web/admin/lib/lang/nl_server_ip.lng
+9
-7
interface/web/admin/lib/lang/nl_server_ip_list.lng
interface/web/admin/lib/lang/nl_server_ip_list.lng
+8
-6
interface/web/admin/lib/lang/nl_server_list.lng
interface/web/admin/lib/lang/nl_server_list.lng
+13
-11
interface/web/admin/lib/lang/nl_software_package_install.lng
interface/web/admin/lib/lang/nl_software_package_install.lng
+8
-6
interface/web/admin/lib/lang/nl_software_package_list.lng
interface/web/admin/lib/lang/nl_software_package_list.lng
+13
-10
interface/web/admin/lib/lang/nl_software_repo.lng
interface/web/admin/lib/lang/nl_software_repo.lng
+9
-7
interface/web/admin/lib/lang/nl_software_repo_list.lng
interface/web/admin/lib/lang/nl_software_repo_list.lng
+8
-6
interface/web/admin/lib/lang/nl_software_update_list.lng
interface/web/admin/lib/lang/nl_software_update_list.lng
+11
-8
interface/web/admin/lib/lang/nl_system_config.lng
interface/web/admin/lib/lang/nl_system_config.lng
+25
-22
interface/web/admin/lib/lang/nl_users.lng
interface/web/admin/lib/lang/nl_users.lng
+31
-28
interface/web/admin/lib/lang/nl_users_list.lng
interface/web/admin/lib/lang/nl_users_list.lng
+11
-9
interface/web/admin/lib/lang/pl.lng
interface/web/admin/lib/lang/pl.lng
+44
-43
interface/web/admin/lib/lang/pl_firewall.lng
interface/web/admin/lib/lang/pl_firewall.lng
+12
-11
interface/web/admin/lib/lang/pl_firewall_list.lng
interface/web/admin/lib/lang/pl_firewall_list.lng
+9
-8
interface/web/admin/lib/lang/pl_groups.lng
interface/web/admin/lib/lang/pl_groups.lng
+6
-5
interface/web/admin/lib/lang/pl_groups_list.lng
interface/web/admin/lib/lang/pl_groups_list.lng
+8
-7
interface/web/admin/lib/lang/pl_language_add.lng
interface/web/admin/lib/lang/pl_language_add.lng
+9
-8
interface/web/admin/lib/lang/pl_language_complete.lng
interface/web/admin/lib/lang/pl_language_complete.lng
+8
-7
interface/web/admin/lib/lang/pl_language_export.lng
interface/web/admin/lib/lang/pl_language_export.lng
+7
-6
interface/web/admin/lib/lang/pl_language_import.lng
interface/web/admin/lib/lang/pl_language_import.lng
+9
-8
interface/web/admin/lib/lang/pl_language_list.lng
interface/web/admin/lib/lang/pl_language_list.lng
+8
-7
interface/web/admin/lib/lang/pl_package_install.lng
interface/web/admin/lib/lang/pl_package_install.lng
+8
-7
interface/web/admin/lib/lang/pl_remote_action.lng
interface/web/admin/lib/lang/pl_remote_action.lng
+11
-10
interface/web/admin/lib/lang/pl_remote_user.lng
interface/web/admin/lib/lang/pl_remote_user.lng
+43
-42
interface/web/admin/lib/lang/pl_remote_user_list.lng
interface/web/admin/lib/lang/pl_remote_user_list.lng
+8
-7
interface/web/admin/lib/lang/pl_server.lng
interface/web/admin/lib/lang/pl_server.lng
+14
-13
interface/web/admin/lib/lang/pl_server_config.lng
interface/web/admin/lib/lang/pl_server_config.lng
+78
-77
interface/web/admin/lib/lang/pl_server_config_list.lng
interface/web/admin/lib/lang/pl_server_config_list.lng
+5
-4
interface/web/admin/lib/lang/pl_server_ip.lng
interface/web/admin/lib/lang/pl_server_ip.lng
+8
-7
interface/web/admin/lib/lang/pl_server_ip_list.lng
interface/web/admin/lib/lang/pl_server_ip_list.lng
+7
-6
interface/web/admin/lib/lang/pl_server_list.lng
interface/web/admin/lib/lang/pl_server_list.lng
+12
-11
interface/web/admin/lib/lang/pl_software_package_install.lng
interface/web/admin/lib/lang/pl_software_package_install.lng
+7
-6
interface/web/admin/lib/lang/pl_software_package_list.lng
interface/web/admin/lib/lang/pl_software_package_list.lng
+11
-10
interface/web/admin/lib/lang/pl_software_repo.lng
interface/web/admin/lib/lang/pl_software_repo.lng
+8
-7
interface/web/admin/lib/lang/pl_software_repo_list.lng
interface/web/admin/lib/lang/pl_software_repo_list.lng
+7
-6
interface/web/admin/lib/lang/pl_software_update_list.lng
interface/web/admin/lib/lang/pl_software_update_list.lng
+9
-8
interface/web/admin/lib/lang/pl_system_config.lng
interface/web/admin/lib/lang/pl_system_config.lng
+23
-22
No files found.
docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt
View file @
fb3a98c0
...
...
@@ -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)
...
...
docs/INSTALL_DEBIAN_5.0_multiserver.txt
View file @
fb3a98c0
...
...
@@ -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
...
...
docs/INSTALL_DEBIAN_6.0_courier_mydns.txt
View file @
fb3a98c0
...
...
@@ -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)
...
...
docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt
View file @
fb3a98c0
...
...
@@ -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)
...
...
docs/INSTALL_OPENSUSE_11_3.txt
View file @
fb3a98c0
...
...
@@ -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
...
...
install/dist/lib/centos52.lib.php
View file @
fb3a98c0
...
...
@@ -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
);
...
...
install/dist/lib/centos53.lib.php
View file @
fb3a98c0
...
...
@@ -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
);
...
...
install/dist/lib/fedora.lib.php
View file @
fb3a98c0
...
...
@@ -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.
...
...
install/dist/lib/gentoo.lib.php
View file @
fb3a98c0
...
...
@@ -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
))
{
...
...
install/dist/lib/opensuse.lib.php
View file @
fb3a98c0
...
...
@@ -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.
...
...
install/lib/install.lib.php
View file @
fb3a98c0
...
...
@@ -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'
;
...
...
install/lib/installer_base.lib.php
View file @
fb3a98c0
...
...
@@ -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'
]));
...
...
install/sql/incremental/upd_0002.sql
View file @
fb3a98c0
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'
,
...
...
install/tpl/debian6_dovecot.conf.master
View file @
fb3a98c0
...
...
@@ -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 {
...
...
install/tpl/debian_dovecot.conf.master
View file @
fb3a98c0
...
...
@@ -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
...
...
install/update.php
View file @
fb3a98c0
...
...
@@ -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'
);
...
...
interface/lib/classes/db_mysql.inc.php
View file @
fb3a98c0
...
...
@@ -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'
];
...
...
interface/lib/lang/en.lng
View file @
fb3a98c0
...
...
@@ -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'
;
?>
interface/lib/lang/nl.lng
View file @
fb3a98c0
<?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'
;
?>
interface/lib/lang/pl.lng
View file @
fb3a98c0
<?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"
;
?>
interface/web/admin/lib/lang/nl.lng
View file @
fb3a98c0
<?php
$wb
[
'1001'
]
=
'Gebruikersnaam of wachtwoord is leeg.'
;
$wb
[
'1002'
]
=
'Gebruikersnaam of wachtwoord onjuist.'
;
$wb
[
'Firewall'
]
=
'Firewall'
;
$wb
[
'Groups'
]
=
'Groepen'
;
$wb
[
'groups_description'
]
=
'Formulier om gebruikers en groepen te wijzigen.'
;
$wb
[
'Server'
]
=
'Services'
;
$wb
[
'Server Services'
]
=
'Services'
;
$wb
[
'Services'
]
=
'Services'
;
$wb
[
'Config'
]
=
'Configureer'
;
$wb
[
'Server Config'
]
=
'Configuratie'
;
$wb
[
'Mail'
]
=
'Mail'
;
$wb
[
'Getmail'
]
=
'Getmail'
;
$wb
[
'Web'
]
=
'Web'
;
$wb
[
'FastCGI'
]
=
'FastCGI'
;
$wb
[
'Jailkit'
]
=
'Jailkit'
;
$wb
[
'System'
]
=
'Services per server'
;
$wb
[
'Add user'
]
=
'Nieuwe gebruiker'
;
$wb
[
'Edit user'
]
=
'Wijzig gebruiker'
;
$wb
[
'CP Users'
]
=
'Gebruikers'
;
$wb
[
'Add group'
]
=
'Nieuwe groep'
;
$wb
[
'Edit group'
]
=
'Wijzig groep'
;
$wb
[
'Edit server'
]
=
'Services'
;
$wb
[
'Edit Server IP'
]
=
'IP-adressen'
;
$wb
[
'Servers'
]
=
'Servers'
;
$wb
[
'Sync. Now'
]
=
'Sync. nu'
;
$wb
[
'DB Sync.'
]
=
'DB Sync.'
;
$wb
[
'Languages'
]
=
'Talen en taal-bestanden'
;
$wb
[
'New Language'
]
=
'Nieuwe taal'
;
$wb
[
'Export'
]
=
'Exporteren'
;
$wb
[
'Import'
]
=
'Importeren'
;
$wb
[
'Merge'
]
=
'Samenvoegen'
;
$wb
[
'Language Editor'
]
=
'Taalbestanden'
;
$wb
[
'Software'
]
=
'Software'
;
$wb
[
'Repositories'
]
=
'Bronnen'
;
$wb
[
'Packages'
]
=
'Pakketten'
;
$wb
[
'Updates'
]
=
'Updates'
;
$wb
[
'Remote Users'
]
=
'API gebruikers'
;
$wb
[
'Interface Config'
]
=
'Omgevingsvariabelen'
;
$wb
[
'Remote Actions'
]
=
'Remote Actions'
;
$wb
[
'Do OS-Update'
]
=
'Do OS-Update'
;
$wb
[
'Do ISPConfig-Update'
]
=
'Do ISPConfig-Update'
;
?>
<?php
$wb
[
1001
]
=
"Gebruikersnaam of wachtwoord is niet ingvuld."
;
$wb
[
1002
]
=
"Gebruikersnaam of wachtwoord is niet ingvuld."
;
$wb
[
'Firewall'
]
=
'Firewall'
;
$wb
[
'Groups'
]
=
'Groepen'
;
$wb
[
'groups_description'
]
=
'Formulier om systeemgebruiker groepen te wijzigen.'
;
$wb
[
'Server'
]
=
'Server'
;
$wb
[
'Services'
]
=
'Services'
;
$wb
[
'Config'
]
=
'Config'
;
$wb
[
'Server Config'
]
=
'Server Config'
;
$wb
[
'Mail'
]
=
'Mail'
;
$wb
[
'Getmail'
]
=
'Getmail'
;
$wb
[
'Web'
]
=
'Web'
;
$wb
[
'FastCGI'
]
=
'FastCGI'
;
$wb
[
'Jailkit'
]
=
'Jailkit'
;
$wb
[
'System'
]
=
'System'
;
$wb
[
'Add user'
]
=
'Toevoegen gebruiker'
;
$wb
[
'Edit user'
]
=
'Wijzigen gebruiker'
;
$wb
[
'CP Users'
]
=
'CP Gebruikers'
;
$wb
[
'Add group'
]
=
'Toevoegen groep'
;
$wb
[
'Edit group'
]
=
'Wijzigen groep'
;
$wb
[
'Groups'
]
=
'Groepen'
;
$wb
[
'Edit server'
]
=
'Wijzigen server'
;
$wb
[
'Edit Server IP'
]
=
'Server IP adressen'
;
$wb
[
'Servers'
]
=
'Servers'
;
$wb
[
'Sync. Now'
]
=
'Sync. nu'
;
$wb
[
'DB Sync.'
]
=
'DB Sync.'
;
$wb
[
'Languages'
]
=
'Talen'
;
$wb
[
'New Language'
]
=
'Nieuwe taal'
;
$wb
[
'Export'
]
=
'Exporteer'
;
$wb
[
'Import'
]
=
'Importeer'
;
$wb
[
'Language Editor'
]
=
'Taal editor'
;
$wb
[
'Software'
]
=
'Apps & addons'
;
$wb
[
'Repositories'
]
=
'Repositories'
;
$wb
[
'Server Services'
]
=
'Server services'
;
$wb
[
'Interface Config'
]
=
'Interface config'
;
$wb
[
'Packages'
]
=
'Paketten'
;
$wb
[
'Updates'
]
=
'Updates'
;
$wb
[
'Merge'
]
=
'Samenvoegen'
;
$wb
[
'Remote Users'
]
=
'Remote gebruikers'
;
$wb
[
'Remote Actions'
]
=
'Remote acties'
;
$wb
[
'Do OS-Update'
]
=
'Voer een OS-Update uit'
;
$wb
[
'Do ISPConfig-Update'
]
=
'Voer een ISPConfig-update uit'
;
?>
interface/web/admin/lib/lang/nl_firewall.lng
View file @
fb3a98c0
<?php
$wb
[
'server_id_txt'
]
=
'Server'
;
$wb
[
'tcp_port_txt'
]
=
'Open TCP poorten'
;
$wb
[
'udp_port_txt'
]
=
'Open UDP poorten'
;
$wb
[
'tcp_port_help_txt'
]
=
'Gescheiden door komma'
;
$wb
[
'udp_port_help_txt'
]
=
'Gescheiden door komma'
;
$wb
[
'active_txt'
]
=
'Actief?'
;
$wb
[
'firewall_error_unique'
]
=
'Er bestaat al een firewall record voor deze server.'
;
$wb
[
'tcp_ports_error_regex'
]
=
'Karakter niet toegestaan in tcp poort toewijzing. Toegestane tekens zijn cijfers, : en ,'
;
$wb
[
'udp_ports_error_regex'
]
=
'Karakter niet toegestaan in udp poort toewijzing. Toegestane tekens zijn cijfers, : en ,'
;
?>
<?php
$wb
[
"server_id_txt"
]
=
'Server'
;
$wb
[
"tcp_port_txt"
]
=
'Open TCP poorten'
;
$wb
[
"udp_port_txt"
]
=
'Open UDP poorten'
;
$wb
[
"tcp_port_help_txt"
]
=
'Gescheiden door komma'
;
$wb
[
"udp_port_help_txt"
]
=
'Gescheiden door komma'
;
$wb
[
"active_txt"
]
=
'Actief'
;
$wb
[
"firewall_error_unique"
]
=
'Er is al een firewall record voor deze server.'
;
$wb
[
"active_txt"
]
=
'Actief'
;