diff --git a/install/dist/conf/ubuntu2004.conf.php b/install/dist/conf/ubuntu2004.conf.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe5a9b083b84db4cd400ef655e9cf5a84170f546
--- /dev/null
+++ b/install/dist/conf/ubuntu2004.conf.php
@@ -0,0 +1,235 @@
+<?php
+
+/*
+Copyright (c) 2020, Till Brehm, ISPConfig UG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//*** Ubuntu 18.04 default settings
+
+//* Main
+$conf['language'] = 'en';
+$conf['distname'] = 'ubuntu2004';
+$conf['hostname'] = 'server1.domain.tld'; // Full hostname
+$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
+$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
+$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
+$conf['ispconfig_log_dir'] = '/var/log/ispconfig';
+$conf['server_id'] = 1;
+$conf['init_scripts'] = '/etc/init.d';
+$conf['runlevel'] = '/etc';
+$conf['shells'] = '/etc/shells';
+$conf['pam'] = '/etc/pam.d';
+
+//* Services provided by this server, this selection will be overridden by the expert mode
+$conf['services']['mail'] = true;
+$conf['services']['web'] = true;
+$conf['services']['dns'] = true;
+$conf['services']['file'] = true;
+$conf['services']['db'] = true;
+$conf['services']['vserver'] = true;
+$conf['services']['proxy'] = false;
+$conf['services']['firewall'] = false;
+
+//* MySQL
+$conf['mysql']['installed'] = false; // will be detected automatically during installation
+$conf['mysql']['init_script'] = 'mysql';
+$conf['mysql']['host'] = 'localhost';
+$conf['mysql']['ip'] = '127.0.0.1';
+$conf['mysql']['port'] = '3306';
+$conf['mysql']['database'] = 'dbispconfig';
+$conf['mysql']['admin_user'] = 'root';
+$conf['mysql']['admin_password'] = '';
+$conf['mysql']['charset'] = 'utf8';
+$conf['mysql']['ispconfig_user'] = 'ispconfig';
+$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
+$conf['mysql']['master_slave_setup'] = 'n';
+$conf['mysql']['master_host'] = '';
+$conf['mysql']['master_database'] = 'dbispconfig';
+$conf['mysql']['master_admin_user'] = 'root';
+$conf['mysql']['master_admin_password'] = '';
+$conf['mysql']['master_ispconfig_user'] = '';
+$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));
+
+//* Apache
+$conf['apache']['installed'] = false; // will be detected automatically during installation
+$conf['apache']['user'] = 'www-data';
+$conf['apache']['group'] = 'www-data';
+$conf['apache']['init_script'] = 'apache2';
+$conf['apache']['version'] = '2.4';
+$conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
+$conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled';
+$conf['apache']['vhost_port'] = '8080';
+$conf['apache']['php_ini_path_apache'] = '/etc/php/7.4/apache2/php.ini';
+$conf['apache']['php_ini_path_cgi'] = '/etc/php/7.4/cgi/php.ini';
+
+//* Website base settings
+$conf['web']['website_basedir'] = '/var/www';
+$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]';
+$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/';
+
+//* Apps base settings
+$conf['web']['apps_vhost_ip'] = '_default_';
+$conf['web']['apps_vhost_port'] = '8081';
+$conf['web']['apps_vhost_servername'] = '';
+$conf['web']['apps_vhost_user'] = 'ispapps';
+$conf['web']['apps_vhost_group'] = 'ispapps';
+
+//* Fastcgi
+$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/7.4/cgi/';
+$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
+$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';
+
+//* Postfix
+$conf['postfix']['installed'] = false; // will be detected automatically during installation
+$conf['postfix']['config_dir'] = '/etc/postfix';
+$conf['postfix']['init_script'] = 'postfix';
+$conf['postfix']['user'] = 'postfix';
+$conf['postfix']['group'] = 'postfix';
+$conf['postfix']['vmail_userid'] = '5000';
+$conf['postfix']['vmail_username'] = 'vmail';
+$conf['postfix']['vmail_groupid'] = '5000';
+$conf['postfix']['vmail_groupname'] = 'vmail';
+$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
+
+//* Mailman
+$conf['mailman']['installed'] = false; // will be detected automatically during installation
+$conf['mailman']['config_dir'] = '/etc/mailman';
+$conf['mailman']['init_script'] = 'mailman';
+
+//* Getmail
+$conf['getmail']['installed'] = false; // will be detected automatically during installation
+$conf['getmail']['config_dir'] = '/etc/getmail';
+$conf['getmail']['program'] = '/usr/bin/getmail';
+
+//* Courier
+$conf['courier']['installed'] = false; // will be detected automatically during installation
+$conf['courier']['config_dir'] = '/etc/courier';
+$conf['courier']['courier-authdaemon'] = 'courier-authdaemon';
+$conf['courier']['courier-imap'] = 'courier-imap';
+$conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
+$conf['courier']['courier-pop'] = 'courier-pop';
+$conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
+
+//* Dovecot
+$conf['dovecot']['installed'] = false; // will be detected automatically during installation
+$conf['dovecot']['config_dir'] = '/etc/dovecot';
+$conf['dovecot']['init_script'] = 'dovecot';
+
+//* SASL
+$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
+$conf['saslauthd']['config'] = '/etc/default/saslauthd';
+$conf['saslauthd']['init_script'] = 'saslauthd';
+
+//* Amavisd
+$conf['amavis']['installed'] = false; // will be detected automatically during installation
+$conf['amavis']['config_dir'] = '/etc/amavis';
+$conf['amavis']['init_script'] = 'amavis';
+
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
+//* ClamAV
+$conf['clamav']['installed'] = false; // will be detected automatically during installation
+$conf['clamav']['init_script'] = 'clamav-daemon';
+
+//* Pureftpd
+$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
+$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
+$conf['pureftpd']['init_script'] = 'pure-ftpd-mysql';
+
+//* MyDNS
+$conf['mydns']['installed'] = false; // will be detected automatically during installation
+$conf['mydns']['config_dir'] = '/etc';
+$conf['mydns']['init_script'] = 'mydns';
+
+//* PowerDNS
+$conf['powerdns']['installed'] = false; // will be detected automatically during installation
+$conf['powerdns']['database'] = 'powerdns';
+$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
+$conf['powerdns']['init_script'] = 'pdns';
+
+//* BIND DNS Server
+$conf['bind']['installed'] = false; // will be detected automatically during installation
+$conf['bind']['bind_user'] = 'root';
+$conf['bind']['bind_group'] = 'bind';
+$conf['bind']['bind_zonefiles_dir'] = '/etc/bind';
+$conf['bind']['named_conf_path'] = '/etc/bind/named.conf';
+$conf['bind']['named_conf_local_path'] = '/etc/bind/named.conf.local';
+$conf['bind']['init_script'] = 'bind9';
+
+//* Jailkit
+$conf['jailkit']['installed'] = false; // will be detected automatically during installation
+$conf['jailkit']['config_dir'] = '/etc/jailkit';
+$conf['jailkit']['jk_init'] = 'jk_init.ini';
+$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
+$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch /etc/localtime';
+$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
+
+//* Squid
+$conf['squid']['installed'] = false; // will be detected automatically during installation
+$conf['squid']['config_dir'] = '/etc/squid';
+$conf['squid']['init_script'] = 'squid';
+
+//* Nginx
+$conf['nginx']['installed'] = false; // will be detected automatically during installation
+$conf['nginx']['user'] = 'www-data';
+$conf['nginx']['group'] = 'www-data';
+$conf['nginx']['config_dir'] = '/etc/nginx';
+$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
+$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
+$conf['nginx']['init_script'] = 'nginx';
+$conf['nginx']['vhost_port'] = '8080';
+$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
+$conf['nginx']['php_fpm_init_script'] = 'php7.4-fpm';
+$conf['nginx']['php_fpm_ini_path'] = '/etc/php/7.4/fpm/php.ini';
+$conf['nginx']['php_fpm_pool_dir'] = '/etc/php/7.4/fpm/pool.d';
+$conf['nginx']['php_fpm_start_port'] = 9010;
+$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php7.4-fpm';
+
+//* OpenVZ
+$conf['openvz']['installed'] = false;
+
+//*Bastille-Firwall
+$conf['bastille']['installed'] = false;
+$conf['bastille']['config_dir'] = '/etc/Bastille';
+
+//* vlogger
+$conf['vlogger']['config_dir'] = '/etc';
+
+//* cron
+$conf['cron']['init_script'] = 'cron';
+$conf['cron']['crontab_dir'] = '/etc/cron.d';
+$conf['cron']['wget'] = '/usr/bin/wget';
+
+//* Metronome XMPP
+$conf['xmpp']['installed'] = false;
+$conf['xmpp']['init_script'] = 'metronome';
+
+
+?>
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 3af8746908c796967f118a82f83dffda675667f2..6a1c5048e870bcbea2c96a7f3d99f612ad5398bd 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -953,24 +953,13 @@ class installer_dist extends installer_base {
//* copy the ISPConfig security part
$command = 'cp -rf ../security '.$install_dir;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
- //* Apply changed security_settings.ini values to new security_settings.ini file
- if(is_file('/usr/local/ispconfig/security/security_settings.ini~')) {
- $security_settings_old = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini~'));
- $security_settings_new = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
- if(is_array($security_settings_new) && is_array($security_settings_old)) {
- foreach($security_settings_new as $section => $sval) {
- if(is_array($sval)) {
- foreach($sval as $key => $val) {
- if(isset($security_settings_old[$section]) && isset($security_settings_old[$section][$key])) {
- $security_settings_new[$section][$key] = $security_settings_old[$section][$key];
- }
- }
- }
- }
- file_put_contents('/usr/local/ispconfig/security/security_settings.ini',array_to_ini($security_settings_new));
- }
+
+ $configfile = 'security_settings.ini';
+ if(is_file($install_dir.'/security/'.$configfile)) {
+ copy($install_dir.'/security/'.$configfile, $install_dir.'/security/'.$configfile.'~');
}
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+ wf($install_dir.'/security/'.$configfile, $content);
//* Create a symlink, so ISPConfig is accessible via web
// Replaced by a separate vhost definition for port 8080
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index ea4e563a6a4bf9e0c849495925060820588b644d..2ed873d9baf4799e80d5c556232a8cb4f50d51bc 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -95,6 +95,10 @@ function get_distname() {
$mainver = current($mainver).'.'.next($mainver);
}
switch ($mainver){
+ case "20.04":
+ $relname = "(Focal Fossa)";
+ $distconfid = 'ubuntu2004';
+ break;
case "18.04":
$relname = "(Bionic Beaver)";
$distconfid = 'ubuntu1804';
@@ -186,7 +190,7 @@ function get_distname() {
break;
default:
$relname = "UNKNOWN";
- $distconfid = 'ubuntu1804';
+ $distconfid = 'ubuntu2004';
}
$distver = $ver.$lts." ".$relname;
swriteln("Operating System: ".$distname.' '.$distver."\n");
@@ -341,15 +345,15 @@ function get_distname() {
$distid = 'centos72';
}
swriteln("Operating System: CentOS $var\n");
- } elseif(stristr($content, 'CentOS Linux release 8')) {
- $distname = 'CentOS';
- $distver = 'Unknown';
- $distbaseid = 'fedora';
+ } elseif(stristr($content, 'CentOS Linux release 8')) {
+ $distname = 'CentOS';
+ $distver = 'Unknown';
+ $distbaseid = 'fedora';
$distid = 'centos80';
- $var=explode(" ", $content);
- $var=explode(".", $var[3]);
- $var=$var[0].".".$var[1];
- swriteln("Operating System: CentOS $var\n");
+ $var=explode(" ", $content);
+ $var=explode(".", $var[3]);
+ $var=$var[0].".".$var[1];
+ swriteln("Operating System: CentOS $var\n");
} else {
$distname = 'Redhat';
$distver = 'Unknown';
@@ -687,8 +691,7 @@ function ini_to_array($ini) {
//* Converts a config array to a string
-function array_to_ini($config_array = '') {
- if($config_array == '') $config_array = $this->config;
+function array_to_ini($config_array) {
$content = '';
foreach($config_array as $section => $data) {
$content .= "[$section]\n";
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 5ca16cc6741e0ef483e8139ed849904ca1198bb4..bc9ed26e1847eab11b04543228d71d9fb43a5e32 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -3228,6 +3228,9 @@ class installer_base {
* @return bool
*/
protected function write_config_file($tConf, $tContents) {
+
+ $args = func_get_args();
+
// Backup config file before writing new contents and stat file
if ( is_file($tConf) ) {
$stat = exec('stat -c \'%a %U %G\' '.escapeshellarg($tConf), $output, $res);
@@ -3241,10 +3244,9 @@ class installer_base {
}
wf($tConf, $tContents); // write file
-
if (func_num_args() >= 4) // override rights and/or ownership
{
- $args = func_get_args();
+
$output = array_slice($args, 2);
switch (sizeof($output)) {
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index 2528100cc51c8fc0bd096d1ef28a168a4cf42fec..c24a454d040e0d5bb6b4d8b613da99a9aae04158 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -192,6 +192,8 @@ class db
}
private function _query($sQuery = '') {
+
+ $aArgs = func_get_args();
$this->do_connect();
if ($sQuery == '') {
@@ -227,7 +229,6 @@ class db
}
} while($ok == false);
- $aArgs = func_get_args();
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
@@ -283,10 +284,17 @@ class db
* @return array result row or NULL if none found
*/
public function queryOneRecord($sQuery = '') {
- if(!preg_match('/limit \d+\s*,\s*\d+$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
-
+
$aArgs = func_get_args();
- $oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
+ if(!empty($aArgs)) {
+ $sQuery = array_shift($aArgs);
+ if($sQuery && !preg_match('/limit \d+(\s*,\s*\d+)?$/i', $sQuery)) {
+ $sQuery .= ' LIMIT 0,1';
+ }
+ array_unshift($aArgs, $sQuery);
+ }
+
+ $oResult = call_user_func_array([&$this, 'query'], $aArgs);
if(!$oResult) return null;
$aReturn = $oResult->get();
@@ -956,7 +964,7 @@ class fakedb_result {
if(!is_array($this->aLimitedData)) return $aItem;
- if(list($vKey, $aItem) = each($this->aLimitedData)) {
+ foreach($this->aLimitedData as $vKey => $aItem) {
if(!$aItem) $aItem = null;
}
return $aItem;
diff --git a/install/sql/incremental/upd_0085.sql b/install/sql/incremental/upd_0085.sql
index 1291262ee77de2453ed053c87680c468fbada34c..755143fc4f841d6d9fb2b812e331df3120b3dc33 100644
--- a/install/sql/incremental/upd_0085.sql
+++ b/install/sql/incremental/upd_0085.sql
@@ -1,3 +1,5 @@
+-- folder_directive_snippets was missing in incremental, inserted for fixing older installations
+ALTER TABLE `web_domain` ADD `folder_directive_snippets` TEXT NULL AFTER `https_port`;
ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL;
ALTER TABLE `web_domain` ADD `log_retention` INT NOT NULL DEFAULT '30' AFTER `https_port`;
ALTER TABLE `web_domain` CHANGE `stats_type` `stats_type` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 'awstats';
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index d8c56de22d1163ee7e148192dbd71680f5e4a7d7..61e9a588593756e8671c1062ae7dd89eb71ffb51 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -89,11 +89,13 @@ NameVirtualHost *:<tmpl_var name="vhost_port">
<IfModule mod_headers.c>
# ISPConfig 3.1 currently requires unsafe-line for both scripts and styles, as well as unsafe-eval
+ Header set Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; object-src 'none'"
<tmpl_var name="ssl_comment">Header set Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; object-src 'none'; upgrade-insecure-requests"
Header set X-Content-Type-Options: nosniff
Header set X-Frame-Options: SAMEORIGIN
Header set X-XSS-Protection: "1; mode=block"
- <tmpl_var name="ssl_comment">Header always edit Set-Cookie (.*) "$1; HTTPOnly; Secure"
+ Header always edit Set-Cookie (.*) "$1; HTTPOnly"
+ <tmpl_var name="ssl_comment">Header always edit Set-Cookie (.*) "$1; Secure"
<IfVersion >= 2.4.7>
Header setifempty Strict-Transport-Security "max-age=15768000"
</IfVersion>
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 02a7b2f65ccccde2db89cfcaac24e86307e88843..8cc70a598d3b0d834f77bd01ce64cd3ad30bd09c 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -45,7 +45,6 @@ if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
}
//** Set a few php.ini values
-if(get_magic_quotes_runtime()) set_magic_quotes_runtime(false);
if(isset($app)) unset($app);
if(isset($conf)) unset($conf);
diff --git a/install/tpl/jk_chrootsh.ini.master b/install/tpl/jk_chrootsh.ini.master
index cfd9e8d19832f7b6adccaf05cff2031619683df3..3373e6aec56db468f92ef30e5c395b71ed716409 100644
--- a/install/tpl/jk_chrootsh.ini.master
+++ b/install/tpl/jk_chrootsh.ini.master
@@ -10,4 +10,4 @@
#relax_home_group=1
skip_injail_passwd_check=1
injail_shell=/bin/bash
-env = TERM, PATH
+env = TERM, PATH, LANG
diff --git a/install/tpl/jk_init.ini.master b/install/tpl/jk_init.ini.master
index 469e655a310469d38ebc5b9f852022d4c82000de..0f62aac9efdd0d3bc0b9c9fe5e98becddeba3821 100644
--- a/install/tpl/jk_init.ini.master
+++ b/install/tpl/jk_init.ini.master
@@ -1,28 +1,28 @@
+# jk_init.ini: jailkit initialization config
+
+# Includes paths to handle Debian 10/9,
+# if other paths are needed please create an issue with the details:
+# https://git.ispconfig.org/ispconfig/ispconfig3/-/issues
+
[uidbasics]
-# this section probably needs adjustment on 64bit systems
-# or non-Linux systems
comment = common files for all jails that need user/group information
-libraries = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, /lib64/libnss*.so.2, /lib/x86_64-linux-gnu/libnss*.so.2
-regularfiles = /etc/nsswitch.conf, /etc/ld.so.conf
+paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, /lib/x86_64-linux-gnu/libnss*.so.2, /lib/arm-linux-gnueabihf/libnss*.so.2, /lib/arm-linux-gnueabihf/libnsl*.so.1, /etc/nsswitch.conf, /etc/ld.so.conf
[netbasics]
comment = common files for all jails that need any internet connectivity
-libraries = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /lib/x86_64-linux-gnu/libnss_dns.so.2
-regularfiles = /etc/resolv.conf, /etc/host.conf, /etc/hosts, /etc/protocols
+paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /lib/libnss_mdns*.so.2, /lib/i386-linux-gnu/libnss_dns.so.2, /lib/x86_64-linux-gnu/libnss_dns.so.2, /etc/resolv.conf, /etc/host.conf, /etc/hosts, /etc/protocols, /etc/services, /etc/ssl/certs/, /usr/lib/ssl/certs
[logbasics]
-comment = timezone information
-regularfiles = /etc/localtime
+comment = timezone information and log sockets
+paths = /etc/localtime
need_logsocket = 1
[jk_lsh]
comment = Jailkit limited shell
-executables = /usr/sbin/jk_lsh
-regularfiles = /etc/jailkit/jk_lsh.ini
+paths = /usr/sbin/jk_lsh, /etc/jailkit/jk_lsh.ini
users = root
groups = root
-need_logsocket = 1
-includesections = uidbasics
+includesections = uidbasics, logbasics
[limitedshell]
comment = alias for jk_lsh
@@ -30,78 +30,77 @@ includesections = jk_lsh
[cvs]
comment = Concurrent Versions System
-executables = /usr/bin/cvs
+paths = cvs
devices = /dev/null
[git]
comment = Fast Version Control System
-executables = /usr/bin/git*
-directories = /usr/share/git-core
-includesections = editors
+paths = /usr/bin/git*, /usr/lib/git-core, /usr/share/git-core, /usr/bin/pager
+includesections = editors, perl, netbasics, basicshell, coreutils
[scp]
comment = ssh secure copy
-executables = /usr/bin/scp
+paths = scp
includesections = netbasics, uidbasics
devices = /dev/urandom
[sftp]
comment = ssh secure ftp
-executables = /usr/lib/sftp-server, /usr/libexec/openssh/sftp-server, /usr/lib/misc/sftp-server, /usr/libexec/sftp-server
+paths = /usr/lib/sftp-server, /usr/libexec/openssh/sftp-server, /usr/lib/misc/sftp-server, /usr/libexec/sftp-server, /usr/lib/openssh/sftp-server
includesections = netbasics, uidbasics
devices = /dev/urandom, /dev/null
+# on solaris
+#paths = /usr/lib/ssh/sftp-server
[ssh]
comment = ssh secure shell
-executables = /usr/bin/ssh
+paths = ssh
includesections = netbasics, uidbasics
-devices = /dev/urandom, /dev/tty
+devices = /dev/urandom, /dev/tty, /dev/null
[rsync]
-executables = /usr/bin/rsync
+paths = rsync
includesections = netbasics, uidbasics
[procmail]
comment = procmail mail delivery
-executables = /usr/bin/procmail, /bin/sh
+paths = procmail, /bin/sh
devices = /dev/null
[basicshell]
comment = bash based shell with several basic utilities
-executables = /bin/sh, /bin/bash, /bin/ls, /bin/cat, /bin/chmod, /bin/mkdir, /bin/cp, /bin/cpio, /bin/date, /bin/dd, /bin/echo, /bin/egrep, /bin/false, /bin/fgrep, /bin/grep, /bin/gunzip, /bin/gzip, /bin/ln, /bin/ls, /bin/mkdir, /bin/mktemp, /bin/more, /bin/mv, /bin/pwd, /bin/rm, /bin/rmdir, /bin/sed, /bin/sh, /bin/sleep, /bin/sync, /bin/tar, /bin/touch, /bin/true, /bin/uncompress, /bin/zcat
-regularfiles = /etc/motd, /etc/issue, /etc/bash.bashrc, /etc/bashrc, /etc/profile
-directories = /usr/lib/locale/en_US.utf8
+paths = /bin/sh, bash, ls, cat, chmod, mkdir, cp, cpio, date, dd, echo, egrep, false, fgrep, grep, gunzip, gzip, ln, ls, mkdir, mktemp, more, mv, pwd, rm, rmdir, sed, sh, sleep, sync, tar, touch, true, uncompress, zcat, /etc/motd, /etc/issue, /etc/bash.bashrc, /etc/bashrc, /etc/profile, /usr/lib/locale/en_US.utf8, uname, expr, xargs
users = root
groups = root
includesections = uidbasics
[midnightcommander]
comment = Midnight Commander
-executables = /usr/bin/mc, /usr/bin/mcedit, /usr/bin/mcview
-directories = /etc/terminfo, /usr/share/terminfo, /usr/share/mc
-includesections = basicshell
+paths = mc, mcedit, mcview, /usr/share/mc
+includesections = basicshell, terminfo
[extendedshell]
comment = bash shell including things like awk, bzip, tail, less
-executables = /usr/bin/awk, /usr/bin/bzip2, /usr/bin/bunzip2, /usr/bin/ldd, /usr/bin/less, /usr/bin/clear, /usr/bin/cut, /usr/bin/du, /usr/bin/find, /usr/bin/head, /usr/bin/less, /usr/bin/md5sum, /usr/bin/nice, /usr/bin/sort, /usr/bin/tac, /usr/bin/tail, /usr/bin/tr, /usr/bin/sort, /usr/bin/wc, /usr/bin/watch, /usr/bin/whoami
+paths = awk, bzip2, bunzip2, ldd, less, clear, cut, du, find, head, less, md5sum, nice, sort, tac, tail, tr, sort, wc, watch, whoami
includesections = basicshell, midnightcommander, editors
+[terminfo]
+comment = terminfo databases, required for example for ncurses or vim
+paths = /etc/terminfo, /usr/share/terminfo, /lib/terminfo
+
[editors]
comment = vim, joe and nano
-executables = /usr/bin/joe, /usr/bin/nano, /usr/bin/vi, /usr/bin/vim, /usr/bin/pico
-regularfiles = /etc/vimrc
-directories = /etc/joe, /etc/terminfo, /usr/share/vim, /usr/share/terminfo, /lib/terminfo
+includesections = terminfo
+paths = joe, nano, vi, vim, /etc/vimrc, /etc/joe, /usr/share/vim
[netutils]
comment = several internet utilities like wget, ftp, rsync, scp, ssh
-executables = /usr/bin/wget, /usr/bin/lynx, /usr/bin/ftp, /usr/bin/host, /usr/bin/rsync, /usr/bin/smbclient
+paths = wget, lynx, ftp, host, rsync, smbclient
includesections = netbasics, ssh, sftp, scp
-directories = /etc/ssl/certs/
-regularfiles = /usr/lib/ssl/certs
[apacheutils]
comment = htpasswd utility
-executables = /usr/bin/htpasswd
+paths = htpasswd
[extshellplusnet]
comment = alias for extendedshell + netutils + apacheutils
@@ -109,45 +108,120 @@ includesections = extendedshell, netutils, apacheutils
[openvpn]
comment = jail for the openvpn daemon
-executables = /usr/sbin/openvpn
+paths = /usr/sbin/openvpn
users = root,nobody
groups = root,nogroup
-includesections = netbasics
devices = /dev/urandom, /dev/random, /dev/net/tun
includesections = netbasics, uidbasics
need_logsocket = 1
[apache]
comment = the apache webserver, very basic setup, probably too limited for you
-executables = /usr/sbin/apache
+paths = /usr/sbin/apache
users = root, www-data
groups = root, www-data
includesections = netbasics, uidbasics
[perl]
comment = the perl interpreter and libraries
-executables = /usr/bin/perl
-directories = /usr/lib/perl, /usr/lib/perl5, /usr/share/perl, /usr/share/perl5
+paths = perl, /usr/lib/perl, /usr/lib/perl5, /usr/share/perl, /usr/share/perl5
[xauth]
comment = getting X authentication to work
-executables = /usr/bin/X11/xauth
-regularfiles = /usr/X11R6/lib/X11/rgb.txt, /etc/ld.so.conf
+paths = /usr/bin/X11/xauth, /usr/X11R6/lib/X11/rgb.txt, /etc/ld.so.conf
[xclients]
comment = minimal files for X clients
-regularfiles = /usr/X11R6/lib/X11/rgb.txt
+paths = /usr/X11R6/lib/X11/rgb.txt
includesections = xauth
[vncserver]
comment = the VNC server program
-executables = /usr/bin/Xvnc, /usr/bin/Xrealvnc
-directories = /usr/X11R6/lib/X11/fonts/
+paths = Xvnc, Xrealvnc, /usr/X11R6/lib/X11/fonts/
includesections = xclients
+[ping]
+comment = Ping program
+paths_w_setuid = /bin/ping
#[xterm]
#comment = xterm
-#executables = /usr/bin/X11/xterm
-#directories = /usr/share/terminfo, /etc/terminfo
+#paths = /usr/bin/X11/xterm, /usr/share/terminfo, /etc/terminfo
#devices = /dev/pts/0, /dev/pts/1, /dev/pts/2, /dev/pts/3, /dev/pts/4, /dev/ptyb4, /dev/ptya4, /dev/tty, /dev/tty0, /dev/tty4
+
++# coreutils from:
++# (echo -ne '\n[coreutils]\ncomment = non-sbin progs from coreutils\npaths = '; dpkg --listfiles coreutils | grep -E '^/bin/|/usr/bin/' | xargs -n1 -i@ echo -n "@, " | sed -e 's/, *$/\n/g' -e 's|/usr/bin/||g' -e 's|/bin/||g') >> /etc/jailkit/jk_init.ini
+
+[coreutils]
+comment = non-sbin progs from coreutils
+paths = cat, chgrp, chmod, chown, cp, date, dd, df, dir, echo, false, ln, ls, mkdir, mknod, mktemp, mv, pwd, readlink, rm, rmdir, sleep, stty, sync, touch, true, uname, vdir, [, arch, b2sum, base32, base64, basename, chcon, cksum, comm, csplit, cut, dircolors, dirname, du, env, expand, expr, factor, fmt, fold, groups, head, hostid, id, install, join, link, logname, md5sum, mkfifo, nice, nl, nohup, nproc, numfmt, od, paste, pathchk, pinky, pr, printenv, printf, ptx, realpath, runcon, seq, sha1sum, sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sort, split, stat, stdbuf, sum, tac, tail, tee, test, timeout, tr, truncate, tsort, tty, unexpand, uniq, unlink, users, wc, who, whoami, yes, md5sum.textutils
+
+[wp]
+comment = WordPress Command Line
+paths = wp, /usr/local/bin/php
+includesections = php, mysql-client
+
+[mysql-client]
+comment = mysql client
+paths = mysql, mysqldump, mysqlshow, /usr/lib/libmysqlclient.so, /usr/lib/i386-linux-gnu/libmariadb.so.3, /usr/lib/i386-linux-gnu/mariadb19, /usr/lib/x86_64-linux-gnu/libmariadb.so.3, /usr/lib/x86_64-linux-gnu/mariadb19
+includesections = netbasics
+
+[composer]
+comment = composer
+paths = composer, /usr/local/bin/composer, /usr/share/doc/composer
+includesections = php, uidbasics, netbasics
+
+[node]
+comment = NodeJS
+paths = npm, node, nodejs, /usr/lib/nodejs, /usr/share/node-mime, /usr/lib/node_modules, /usr/local/lib/nodejs, /usr/local/lib/node_modules, elmi-to-json, /usr/local/bin/elmi-to-json
+
+[env]
+comment = /usr/bin/env for environment variables
+paths = env
+
+# Debian 10 default php version is 7.3 (Debian 9 is 7.0)
+# Todo: set default version in ISPConfig installer,
+# but install the php cli version matching the website
+[php]
+comment = default php version and libraries
+paths = /usr/bin/php
+includesections = php_common, php7_3
+
+[php_common]
+comment = common php directories and libraries
+# notice: potential information leak
+# do not add all of /etc/php/ or any of the fpm directories
+# or the php config (which includes custom php snippets) from *all*
+# sites which use fpm will be copied to *every* jailkit
+paths = /usr/bin/php, /usr/lib/php/, /usr/share/php/, /usr/share/zoneinfo/
+includesections = env
+
+[php5_6]
+comment = php version 5.6
+paths = /usr/bin/php5.6, /usr/lib/php/5.6/, /usr/lib/php/20131226/, /usr/share/php/5.6/, /etc/php/5.6/cli/, /etc/php/5.6/mods-available/
+includesections = php_common
+
+[php7_0]
+comment = php version 7.0
+paths = /usr/bin/php7.0, /usr/lib/php/7.0/, /usr/lib/php/20151012/, /usr/share/php/7.0/, /etc/php/7.0/cli/, /etc/php/7.0/mods-available/
+includesections = php_common
+
+[php7_1]
+comment = php version 7.1
+paths = /usr/bin/php7.1, /usr/lib/php/7.1/, /usr/lib/php/20160303/, /usr/share/php/7.1/, /etc/php/7.1/cli/, /etc/php/7.1/mods-available/
+includesections = php_common
+
+[php7_2]
+comment = php version 7.2
+paths = /usr/bin/php7.2, /usr/lib/php/7.2/, /usr/lib/php/20170718/, /usr/share/php/7.2/, /etc/php/7.2/cli/, /etc/php/7.2/mods-available/
+includesections = php_common
+
+[php7_3]
+comment = php version 7.3
+paths = /usr/bin/php7.3, /usr/lib/php/7.3/, /usr/lib/php/20180731/, /usr/share/php/7.3/, /etc/php/7.3/cli/, /etc/php/7.3/mods-available/
+includesections = php_common
+
+[php7_4]
+comment = php version 7.4
+paths = /usr/bin/php7.4, /usr/lib/php/7.4/, /usr/lib/php/20190902/, /usr/share/php/7.4/, /etc/php/7.4/cli/, /etc/php/7.4/mods-available/
+includesections = php_common
diff --git a/install/tpl/mysql-virtual_forwardings.cf.master b/install/tpl/mysql-virtual_forwardings.cf.master
index 7d5c2e2a472049a2765f0298019ad7c19c5c95f2..e39b129f509714e523aada079519e9a662e06ce8 100644
--- a/install/tpl/mysql-virtual_forwardings.cf.master
+++ b/install/tpl/mysql-virtual_forwardings.cf.master
@@ -1,9 +1,5 @@
user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
-table = mail_forwarding
-select_field = destination
-where_field = source
-# additional_conditions = and type != 'aliasdomain' and active = 'y' and server_id = {server_id}
-additional_conditions = and active = 'y' and server_id = {server_id}
-hosts = {mysql_server_ip}
\ No newline at end of file
+hosts = {mysql_server_ip}
+query = SELECT u.email as target FROM mail_forwarding as s INNER JOIN mail_user as u ON (u.email = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1))) WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND u.disabledeliver = 'n' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s WHERE s.source = '%s' AND s.type IN ('alias', 'forward') and s.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s INNER JOIN mail_forwarding as f ON (f.source = CONCAT('%u@', SUBSTRING_INDEX(s.destination,'@',-1))) WHERE s.source = '@%d' AND s.type = 'aliasdomain' AND s.active = 'y' AND f.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s WHERE s.source = '@%d' AND s.type IN ('catchall') and s.active = 'y' AND s.server_id = {server_id} UNION SELECT s.destination as target FROM mail_forwarding as s INNER JOIN mail_forwarding as t ON (t.source = s.destination AND t.type = 'catchall') WHERE s.source = '@%d' AND s.type = 'aliasdomain' and s.active = 'y' AND t.active = 'y' AND s.server_id = {server_id}
diff --git a/interface/lib/classes/cmstree.inc.php b/interface/lib/classes/cmstree.inc.php
deleted file mode 100644
index ead780ebf26c65fd01d97a10a5f0f640ca54e9be..0000000000000000000000000000000000000000
--- a/interface/lib/classes/cmstree.inc.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?
-
-/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-class nodetree {
- public $childs;
- public $btext;
- public $id;
-}
-
-class cmstree
-{
- //TODO is this used ?? - pedro
- //var $_table;
-
- // $vars enth�lt:
- // - parent :id des Elternelementes
- // - type :n = node, i = item
- // - doctype_id :id des Dokumententyps, wenn nicht im content Feld
- // - title :Titel des Eintrages
- // - status :1 = ok, d = delete
- // - icon :icon im node-tree, optional
- // - modul :modul des Eintrages, noch nicht verwendet
- // - doc_id :id des zugeh�rigen Dokumentes
-
- public function node_list()
- {
- global $app;
-
- $nodes = $app->db->queryAllRecords('SELECT * FROM media_cat order by sort, name');
-
- $optionlist = array();
- $my0 = new nodetree();
-
- foreach($nodes as $row) {
-
- $id = 'my'.$row['media_cat_id'];
- $btext = $row['name'];
- $ordner = 'my'.$row['parent'];
- if(!is_object($$id)) $$id = new nodetree();
- $$id->btext = $btext;
- $$id->id = $row['media_cat_id'];
-
- if(is_object($$ordner)) {
- $$ordner->childs[] = &$$id;
- } else {
- $$ordner = new nodetree();
- $$ordner->childs[] = &$$id;
- }
- }
-
- $this->ptree($my0, 0, $optionlist);
- return is_array($nodes) ? $optionlist : false;
- }
-
- private function ptree($myobj, $tiefe, &$optionlist){
- global $_SESSION;
- $tiefe += 1;
- $id = $myobj->id;
-
- if(is_array($myobj->childs) and ($_SESSION['s']['cat_open'][$id] == 1 or $tiefe <= 1)) {
- foreach($myobj->childs as $val) {
- // kategorie => str_repeat('- ',$tiefe) . $val->btext,
-
- // Ergebnisse Formatieren
- /*
- if($tiefe == 0) {
- $kategorie = "<div class='mnuLevel".$tiefe."'><a href='index.php?pg=liste&kat=".$val->id."' class='navKategorien'>".$val->btext."</a></div>";
- } elseif ($tiefe == 1) {
- $kategorie = "<div class='mnuLevel".$tiefe."'><img src='images/listenpunkt.gif'> <a href='index.php?pg=liste&kat=".$val->id."' class='navKategorien'>".$val->btext."</a></div>";
- } else {
- $kategorie = "<div class='mnuLevel".$tiefe."'> <a href='index.php?pg=liste&kat=".$val->id."' class='navKategorien'>".str_repeat('- ',$tiefe - 1) . $val->btext."</a></div>";
- }
- */
- $val_id = $val->id;
- if($_SESSION['s']['cat_open'][$val_id] == 1) {
- $kategorie = "<div class='mnuLevel".$tiefe."'> <a href='treenavi.php?kat=".$val->id."' class='navtext' onclick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder.png' border='0'> ".$val->btext."</a></div>";
- } else {
- $kategorie = "<div class='mnuLevel".$tiefe."'> <a href='treenavi.php?kat=".$val->id."' class='navtext' onclick=\"parent.content.location='media_list.php?search_media_cat_id=".$val->id."'\" style=\"text-decoration: none;\"><img src='../themes/default/icons/folder_closed.png' border='0'> ".$val->btext."</a></div>";
- }
-
- $optionlist[] = array( media_cat => $kategorie,
- media_cat_id => $val->id,
- depth => $tiefe);
- $this->ptree($val, $tiefe, $optionlist);
- }
- }
- }
-
-}
-?>
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 9c7269e568624cb7ae2f696929130ad1817b9e63..014feec8c319cef6fa5585c5cc91fc3185cc5490 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -258,6 +258,8 @@ class db
private function _query($sQuery = '') {
global $app;
+
+ $aArgs = func_get_args();
if ($sQuery == '') {
$this->_sqlerror('Keine Anfrage angegeben / No query given');
@@ -297,7 +299,6 @@ class db
}
} while($ok == false);
- $aArgs = func_get_args();
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
$this->securityScan($sQuery);
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
@@ -353,10 +354,17 @@ class db
* @return array result row or NULL if none found
*/
public function queryOneRecord($sQuery = '') {
- if(!preg_match('/limit \d+\s*(,\s*\d+)?$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
-
+
$aArgs = func_get_args();
- $oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
+ if(!empty($aArgs)) {
+ $sQuery = array_shift($aArgs);
+ if($sQuery && !preg_match('/limit \d+(\s*,\s*\d+)?$/i', $sQuery)) {
+ $sQuery .= ' LIMIT 0,1';
+ }
+ array_unshift($aArgs, $sQuery);
+ }
+
+ $oResult = call_user_func_array([&$this, 'query'], $aArgs);
if(!$oResult) return null;
$aReturn = $oResult->get();
@@ -1300,7 +1308,7 @@ class fakedb_result {
if(!is_array($this->aLimitedData)) return $aItem;
- if(list($vKey, $aItem) = each($this->aLimitedData)) {
+ foreach($this->aLimitedData as $vKey => $aItem) {
if(!$aItem) $aItem = null;
}
return $aItem;
diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index ef9e0702d212db0b3a773b4c5a0dc900af8e4153..bbb57d60147f4478ec4dca1ba1ccd859fd2edd6f 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -65,7 +65,7 @@ class getconf {
} else {
$app->uses('ini_parser');
$security_config_path = '/usr/local/ispconfig/security/security_settings.ini';
- if(!is_file($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');
+ if(!is_readable($security_config_path)) $security_config_path = realpath(ISPC_ROOT_PATH.'/../security/security_settings.ini');
$this->security_config = $app->ini_parser->parse_ini_string(file_get_contents($security_config_path));
return ($section == '') ? $this->security_config : $this->security_config[$section];
diff --git a/interface/lib/classes/ids.inc.php b/interface/lib/classes/ids.inc.php
index abdf32b30251543045b0302158378748eba17d8b..6d197264178f05c533a5e5dfa1049e95e39ddcc4 100644
--- a/interface/lib/classes/ids.inc.php
+++ b/interface/lib/classes/ids.inc.php
@@ -68,7 +68,7 @@ class ids {
// Get whitelist
$whitelist_path = '/usr/local/ispconfig/security/ids.whitelist';
- if(is_file('/usr/local/ispconfig/security/ids.whitelist.custom')) $whitelist_path = '/usr/local/ispconfig/security/ids.whitelist.custom';
+ if(is_readable('/usr/local/ispconfig/security/ids.whitelist.custom')) $whitelist_path = '/usr/local/ispconfig/security/ids.whitelist.custom';
if(!is_file($whitelist_path)) $whitelist_path = realpath(ISPC_ROOT_PATH.'/../security/ids.whitelist');
$whitelist_lines = file($whitelist_path);
@@ -91,7 +91,7 @@ class ids {
// Get HTML fields
$htmlfield_path = '/usr/local/ispconfig/security/ids.htmlfield';
- if(is_file('/usr/local/ispconfig/security/ids.htmlfield.custom')) $htmlfield_path = '/usr/local/ispconfig/security/ids.htmlfield.custom';
+ if(is_readable('/usr/local/ispconfig/security/ids.htmlfield.custom')) $htmlfield_path = '/usr/local/ispconfig/security/ids.htmlfield.custom';
if(!is_file($htmlfield_path)) $htmlfield_path = realpath(ISPC_ROOT_PATH.'/../security/ids.htmlfield');
$htmlfield_lines = file($htmlfield_path);
diff --git a/interface/lib/classes/remote.d/client.inc.php b/interface/lib/classes/remote.d/client.inc.php
index 1457bf569aef7063a24d9a0ec586a3cd1b2b7d04..57412e5e192bef9f478c59db36c80db1fc5864f5 100644
--- a/interface/lib/classes/remote.d/client.inc.php
+++ b/interface/lib/classes/remote.d/client.inc.php
@@ -108,7 +108,7 @@ class remoting_client extends remoting {
if(isset($rec['client_id'])) {
return $app->functions->intval($rec['client_id']);
} else {
- throw new SoapFault('no_client_found', 'There is no sysuser account for this client ID.');
+ throw new SoapFault('no_client_found', 'There is no sys_user account with this userid.');
return false;
}
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index 771698e9dc5cdfafcbbea5f2c0c800918a20dcac..eec5ff0718c3c1afd50ead219789e85823e42033 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -205,6 +205,9 @@ class remoting_mail extends remoting {
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
return false;
}
+
+ // Email addresses must always be lower case
+ $params['email'] = strtolower($params['email']);
//* Check if mail domain exists
$email_parts = explode('@', $params['email']);
diff --git a/interface/lib/classes/simplepie.inc.php b/interface/lib/classes/simplepie.inc.php
index 626e801e426242351a7e29034808486800332ac6..a2b80ed25b71755c81e56722f453d85d95207630 100644
--- a/interface/lib/classes/simplepie.inc.php
+++ b/interface/lib/classes/simplepie.inc.php
@@ -735,7 +735,7 @@ class simplepie
* @param string $cache_location This is where you want the cache to be stored.
* @param int $cache_duration This is the number of seconds that you want to store the cache file for.
*/
- function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null)
+ function __construct($feed_url = null, $cache_location = null, $cache_duration = null)
{
// Other objects, instances created here so we can set options on them
$this->sanitize = new SimplePie_Sanitize;
@@ -3165,7 +3165,7 @@ class SimplePie_Item
var $feed;
var $data = array();
- function SimplePie_Item($feed, $data)
+ function __construct($feed, $data)
{
$this->feed = $feed;
$this->data = $data;
@@ -5789,7 +5789,7 @@ class SimplePie_Source
var $item;
var $data = array();
- function SimplePie_Source($item, $data)
+ function __construct($item, $data)
{
$this->item = $item;
$this->data = $data;
@@ -6344,7 +6344,7 @@ class SimplePie_Author
var $email;
// Constructor, used to input the data
- function SimplePie_Author($name = null, $link = null, $email = null)
+ function __construct($name = null, $link = null, $email = null)
{
$this->name = $name;
$this->link = $link;
@@ -6402,7 +6402,7 @@ class SimplePie_Category
var $label;
// Constructor, used to input the data
- function SimplePie_Category($term = null, $scheme = null, $label = null)
+ function __construct($term = null, $scheme = null, $label = null)
{
$this->term = $term;
$this->scheme = $scheme;
@@ -6484,7 +6484,7 @@ class SimplePie_Enclosure
var $width;
// Constructor, used to input the data
- function SimplePie_Enclosure($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
+ function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
{
$this->bitrate = $bitrate;
$this->captions = $captions;
@@ -7419,7 +7419,7 @@ class SimplePie_Caption
var $text;
// Constructor, used to input the data
- function SimplePie_Caption($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
+ function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
{
$this->type = $type;
$this->lang = $lang;
@@ -7503,7 +7503,7 @@ class SimplePie_Credit
var $name;
// Constructor, used to input the data
- function SimplePie_Credit($role = null, $scheme = null, $name = null)
+ function __construct($role = null, $scheme = null, $name = null)
{
$this->role = $role;
$this->scheme = $scheme;
@@ -7560,7 +7560,7 @@ class SimplePie_Copyright
var $label;
// Constructor, used to input the data
- function SimplePie_Copyright($url = null, $label = null)
+ function __construct($url = null, $label = null)
{
$this->url = $url;
$this->label = $label;
@@ -7604,7 +7604,7 @@ class SimplePie_Rating
var $value;
// Constructor, used to input the data
- function SimplePie_Rating($scheme = null, $value = null)
+ function __construct($scheme = null, $value = null)
{
$this->scheme = $scheme;
$this->value = $value;
@@ -7649,7 +7649,7 @@ class SimplePie_Restriction
var $value;
// Constructor, used to input the data
- function SimplePie_Restriction($relationship = null, $type = null, $value = null)
+ function __construct($relationship = null, $type = null, $value = null)
{
$this->relationship = $relationship;
$this->type = $type;
@@ -7715,7 +7715,7 @@ class SimplePie_File
var $error;
var $method = SIMPLEPIE_FILE_SOURCE_NONE;
- function SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false)
+ function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false)
{
if (class_exists('idna_convert'))
{
@@ -8036,7 +8036,7 @@ class SimplePie_HTTP_Parser
* @access public
* @param string $data Input data
*/
- function SimplePie_HTTP_Parser($data)
+ function __construct($data)
{
$this->data = $data;
$this->data_length = strlen($this->data);
@@ -8512,7 +8512,7 @@ class SimplePie_gzdecode
*
* @access public
*/
- function SimplePie_gzdecode($data)
+ function __construct($data)
{
$this->compressed_data = $data;
$this->compressed_size = strlen($data);
@@ -8705,7 +8705,7 @@ class SimplePie_Cache
*
* @access private
*/
- function SimplePie_Cache()
+ function __construct()
{
trigger_error('Please call SimplePie_Cache::create() instead of the constructor', E_USER_ERROR);
}
@@ -8743,7 +8743,7 @@ class SimplePie_Cache_File
var $extension;
var $name;
- function SimplePie_Cache_File($location, $filename, $extension)
+ function __construct($location, $filename, $extension)
{
$this->location = $location;
$this->filename = $filename;
@@ -8905,7 +8905,7 @@ class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
var $options;
var $id;
- function SimplePie_Cache_MySQL($mysql_location, $name, $extension)
+ function __construct($mysql_location, $name, $extension)
{
$host = $mysql_location->get_host();
if (SimplePie_Misc::stripos($host, 'unix(') === 0 && substr($host, -1) === ')')
@@ -11532,7 +11532,7 @@ class SimplePie_Decode_HTML_Entities
* @access public
* @param string $data Input data
*/
- function SimplePie_Decode_HTML_Entities($data)
+ function __construct($data)
{
$this->data = $data;
}
@@ -11795,7 +11795,7 @@ class SimplePie_IRI
* @param string $iri
* @return SimplePie_IRI
*/
- function SimplePie_IRI($iri)
+ function __construct($iri)
{
$iri = (string) $iri;
if ($iri !== '')
@@ -13184,7 +13184,7 @@ class SimplePie_Parse_Date
*
* @access private
*/
- function SimplePie_Parse_Date()
+ function __construct()
{
$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
@@ -13658,7 +13658,7 @@ class SimplePie_Content_Type_Sniffer
* @access public
* @param SimplePie_Content_Type_Sniffer $file Input file
*/
- function SimplePie_Content_Type_Sniffer($file)
+ function __construct($file)
{
$this->file = $file;
}
@@ -13990,7 +13990,7 @@ class SimplePie_XML_Declaration_Parser
* @access public
* @param string $data Input data
*/
- function SimplePie_XML_Declaration_Parser($data)
+ function __construct($data)
{
$this->data = $data;
$this->data_length = strlen($this->data);
@@ -14259,7 +14259,7 @@ class SimplePie_Locator
var $max_checked_feeds = 10;
var $content_type_sniffer_class = 'SimplePie_Content_Type_Sniffer';
- function SimplePie_Locator(&$file, $timeout = 10, $useragent = null, $file_class = 'SimplePie_File', $max_checked_feeds = 10, $content_type_sniffer_class = 'SimplePie_Content_Type_Sniffer')
+ function __construct(&$file, $timeout = 10, $useragent = null, $file_class = 'SimplePie_File', $max_checked_feeds = 10, $content_type_sniffer_class = 'SimplePie_Content_Type_Sniffer')
{
$this->file =& $file;
$this->file_class = $file_class;
diff --git a/interface/lib/classes/system.inc.php b/interface/lib/classes/system.inc.php
index b6d3479694193287a1e8c878e5af11225e5b7a3d..89507ea68cadba60599d469c6463fd521a706855 100644
--- a/interface/lib/classes/system.inc.php
+++ b/interface/lib/classes/system.inc.php
@@ -65,12 +65,13 @@ class system {
public function exec_safe($cmd) {
$arg_count = func_num_args();
+ $args = func_get_args();
+
if($arg_count != substr_count($cmd, '?') + 1) {
trigger_error('Placeholder count not matching argument list.', E_USER_WARNING);
return false;
}
if($arg_count > 1) {
- $args = func_get_args();
array_shift($args);
$pos = 0;
diff --git a/interface/lib/classes/tform_base.inc.php b/interface/lib/classes/tform_base.inc.php
index e6174d2da763556a2a3f94f8ad4ccb57fba3cbbd..bd9f70a626ef308391f5a0f8ef3ae04a35507311 100644
--- a/interface/lib/classes/tform_base.inc.php
+++ b/interface/lib/classes/tform_base.inc.php
@@ -152,9 +152,9 @@ class tform_base {
$wb = $app->functions->array_merge($wb_global, $wb);
}
if(isset($wb_global)) unset($wb_global);
-
+
$this->wordbook = $wb;
-
+
$app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'] . ':on_after_formdef', $this);
$this->dateformat = $app->lng('conf_format_dateshort');
@@ -323,7 +323,7 @@ class tform_base {
return $this->getAuthSQL('r', $matches[1]);
}
*/
-
+
/**
* Get the key => value array of a form filled from a datasource definitiom
*
@@ -339,12 +339,12 @@ class tform_base {
function applyValueLimit($limit, $values, $current_value = '') {
global $app;
-
+
// we mas have multiple limits, therefore we explode by ; first
// Example: "system:sites:web_php_options;client:web_php_options"
$limits = explode(';',$limit);
-
-
+
+
foreach($limits as $limit) {
$limit_parts = explode(':', $limit);
@@ -399,7 +399,7 @@ class tform_base {
$tmp_key = $limit_parts[2];
$allowed = $allowed = explode(',',$tmp_conf[$tmp_key]);
}
-
+
// add the current value to the allowed array
$allowed[] = $current_value;
@@ -438,7 +438,7 @@ class tform_base {
$csrf_token = $app->auth->csrf_token_get($this->formDef['name']);
$_csrf_id = $csrf_token['csrf_id'];
$_csrf_value = $csrf_token['csrf_key'];
-
+
$this->formDef['tabs'][$tab]['fields']['_csrf_id'] = array(
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
@@ -454,7 +454,7 @@ class tform_base {
$record['_csrf_id'] = $_csrf_id;
$record['_csrf_key'] = $_csrf_value;
/* CSRF PROTECTION */
-
+
$new_record = array();
if($action == 'EDIT') {
$record = $this->decode($record, $tab);
@@ -589,7 +589,7 @@ class tform_base {
$new_record[$key] = $this->_getDateHTML($key, $dt_value);
break;
-
+
default:
if(isset($record[$key])) {
$new_record[$key] = $app->functions->htmlentities($record[$key]);
@@ -701,7 +701,7 @@ class tform_base {
$new_record[$key] = $this->_getDateTimeHTML($key, $dt_value, $display_seconds);
break;
-
+
case 'DATE':
$dt_value = (isset($field['default'])) ? $field['default'] : 0;
@@ -750,7 +750,7 @@ class tform_base {
unset($_POST);
unset($record);
}
-
+
if(isset($_SESSION['_csrf_timeout']) && is_array($_SESSION['_csrf_timeout'])) {
$to_unset = array();
foreach($_SESSION['_csrf_timeout'] as $_csrf_id => $timeout) {
@@ -767,7 +767,7 @@ class tform_base {
}
/* CSRF PROTECTION */
}
-
+
$new_record = array();
if(is_array($record)) {
foreach($fields as $key => $field) {
@@ -1065,6 +1065,29 @@ class tform_base {
}
unset($error);
break;
+ case 'ISEMAILADDRESS':
+ $error = false;
+ if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
+ if($validator['allowempty'] == 'y' && $field_value == '') {
+ //* Do nothing
+ } else {
+ if(function_exists('filter_var')) {
+ if(filter_var($field_value, FILTER_VALIDATE_EMAIL) === false) {
+ $error = true;
+ }
+ if ($error) {
+ $errmsg = $validator['errmsg'];
+ if(isset($this->wordbook[$errmsg])) {
+ $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
+ } else {
+ $this->errorMessage .= $errmsg."<br />\r\n";
+ }
+ }
+
+ } else $this->errorMessage .= "function filter_var missing <br />\r\n";
+ }
+ unset($error);
+ break;
case 'ISINT':
if(function_exists('filter_var') && $field_value < PHP_INT_MAX) {
//if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT, array("options" => array('min_range'=>0))) === false) {
@@ -1198,7 +1221,7 @@ class tform_base {
}
}
break;
-
+
case 'ISDATETIME':
/* Checks a datetime value against the date format of the current language */
if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
@@ -1216,7 +1239,7 @@ class tform_base {
}
}
break;
-
+
case 'RANGE':
//* Checks if the value is within the given range or above / below a value
//* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".
@@ -1281,7 +1304,7 @@ class tform_base {
$sql_update = '';
$record = $this->encode($record, $tab, true);
-
+
if(($this->primary_id_override > 0)) {
$sql_insert_key .= '`'.$this->formDef["db_table_idx"].'`, ';
$sql_insert_val .= $this->primary_id_override.", ";
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index e928d6e5ef1a44c3448d6e43af1a7c4b7e0e7b62..4123c113d18a4a8d298321fc5610dc805425659b 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 6f3ec99b4d19e43d4189db83d27e397958284f7c..463d1c7b2a2e0c08b40bbe929412c8794c115869 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index d6d266b3e05d0c2d09f0625a5992f0c6924b3505..65a2dc4fd754a3086d8c386b57936931dd5e3d55 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Habilitar';
$wb['ufw_manage_builtins_txt'] = 'Gerenciar regras embutidas';
$wb['ufw_ipv6_txt'] = 'Habilitar IPv6';
diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
index 7bca04abdcca2eb8bc7be3f72a56f3e571f69074..496df78f77719a6b8f774d4f2ce9e52878ff9585 100644
--- a/interface/web/admin/lib/lang/ca_server_config.lng
+++ b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
$wb['ufw_ipv6_txt'] = 'Enable IPv6';
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index b165a5261aa5cfc9358e61666acd2fd436f8affe..fbc1d777c38db51e08644ad60c7aaf92d94f800c 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot adresář';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekce';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootované aplikace';
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 046fff1a1fa3f85a76327f01ea031b5e01ae752a..1646360a7ad59cca871ffb39a87105b7a81ac0c5 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit Chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit Chroot Anwendungsbereiche';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit Chrooted Anwendungen';
diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
index 890b226a5577b211cf31a9df0441fa31aa680e14..476e43216105bb5ed402fb7c81d0a689c952f33d 100644
--- a/interface/web/admin/lib/lang/dk_server_config.lng
+++ b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Enable';
$wb['ufw_manage_builtins_txt'] = 'Administrer Builtin Rules';
$wb['ufw_ipv6_txt'] = 'Enable IPv6';
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index 0af00d842631a4a61b877d53915592c775b69bcb..cf215b939e148c2707c55f7b348bb2d0d1cfaba8 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index 5531a88158ef276b599f3a0728e907479bfa1bc5..e12e1d40426ca203f7579865c791eb1b3235fa96 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb["ufw_enable_txt"] = 'Enable';
$wb["ufw_manage_builtins_txt"] = 'Manage Builtin Rules';
$wb["ufw_ipv6_txt"] = 'Enable IPv6';
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 9a16ecb5a844559761135077f3b842020e7a768f..f34393169587445521f160bd3420c5244532bf9f 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
$wb['admin_notify_events_txt'] = 'Enviar correo al administrador a partir de siguiente nivel';
$wb['apache_group_error_empty'] = 'El grupo de Apache está vacÃo.';
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index e36832ebec14831d7e603a8d96875ce3dd97d0a4..6eefadb45f44fbf9d8c69851a1d4fbd0214842e9 100644
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot-kotikansio';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot-ohjelmaosiot';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted-ohjelmat';
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 3a364fbaf3946740922e300deac0a77424e81fd8..88717952099a752ca420245a0566b1cf3d508d47 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit';
$wb['jailkit_chroot_app_sections_txt'] = 'Sections des applications chrootées Jailkit';
$wb['jailkit_chroot_app_programs_txt'] = 'Applications chrootées Jailkit';
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index e6d484f34ee2d20bc39d8e340130028e715dd9d0..b36fd1348643d5833a2891a007373581e98fb8ac 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot direktorij';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcije';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrootane aplikacije';
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 588b61fcbea8917da074775f97879a31921a12ec..789e86a64989643f0a039e5edc585bd869fd6b08 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 8e5c2a8ad5f6005c02a370f8a8e6125d19b57169..ee197a4d0a9e9154c78b6c09363d8231c66f162e 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Home chroot Jailkit';
$wb['jailkit_chroot_app_sections_txt'] = 'Bagian app chroot';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit aplikasi yang ter-chroot';
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index df92b25d58cd6191bc77b102fd74655138460ac0..cd71123720fffca2b2ed0f0d35ee11e55bcca809 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index b65a305d86eacc18095bef590fde94598bd8226f..4ef8d13422baef55f4a63c3031bee07294a658a9 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'chroot ホーム';
$wb['jailkit_chroot_app_sections_txt'] = '利用å¯èƒ½ã‚¢ãƒ—リケーションセクション';
$wb['jailkit_chroot_app_programs_txt'] = '利用å¯èƒ½ã‚¢ãƒ—リケーション';
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index 4c01f999b728ad95f2036793bf1f2bb0787f5662..5b5fcf122bf4350700f11285a66eb928b832a16b 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Configuratie';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app secties';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applicaties';
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index 5d156faaf2cda39b193321cfc6f6aa7d4ae504ea..1d6caa8e5eff0879c14e9dac9e7c42d7e8a47441 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Adres roota Jailkit';
$wb['jailkit_chroot_app_sections_txt'] = 'Sekcje aplikacji roota Jailkit';
$wb['jailkit_chroot_app_programs_txt'] = 'Ścieżki aplikacji roota Jailkit';
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 480433a96ad28fe8986e04f78455f9f90d0b9e92..fcf7a23e88117d6f58b1cf75950fd5e4947f4944 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Raiz do Chroot Jailkit';
$wb['jailkit_chroot_app_sections_txt'] = 'Aplicações Jailkit chroot (Sessões)';
$wb['jailkit_chroot_app_programs_txt'] = 'Aplicações Jailkit em ambiente chroot';
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 3602156437a0ac784d36927e94445a7844b4ede1..2c3b4fdce48d33abc402d4312ba7f338c68e4b1e 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 8e8f661eb614b1e16244f6a233a8237121c10fa2..f3f5a47c7d907006a4f4f4a80e62b163d4484c16 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Путь к домашней папке Jailkit chroot';
$wb['jailkit_chroot_app_sections_txt'] = 'Пакеты программ Jailkit chroot';
$wb['jailkit_chroot_app_programs_txt'] = 'Программы Jailkit chrooted';
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 5d30941b7c68f7e051159041fe82a1a315bf6b9c..634c3655a76d2c7a32dac14b8906275d940f4349 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index db96f8f259e5bf2812f385cc6960c37baa9670a4..50c8c0b4c9d0bac3c70cc96802c8d430ab0ab2e3 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['jailkit_chroot_home_txt'] = 'Jailkit chroot domov';
$wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sekcia';
$wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted aplikácia';
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index f6a127818a8977e9bb0cadd20fa049386bba0ff4..09aa3adf2d9bd484cd242db73f572a3b23230872 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -1,5 +1,7 @@
<?php
$wb['server_config'] = 'Server Config';
+$wb['server_config_error_not_updated'] = 'Error in Server Config: not updated';
+$wb['server_config_error_section_not_updated'] = 'Error in Server Config: %s section not updated';
$wb['ufw_enable_txt'] = 'Etkin';
$wb['ufw_manage_builtins_txt'] = 'İç Kural Yönetimi';
$wb['ufw_ipv6_txt'] = 'IPv6 Kullanılsın';
diff --git a/interface/web/admin/server_config_edit.php b/interface/web/admin/server_config_edit.php
index f311f6b1a58e558baaa41ee452d4f08e23be0f1c..cca5d702d3ba03e6600aa93ac39cff6de80b9847 100644
--- a/interface/web/admin/server_config_edit.php
+++ b/interface/web/admin/server_config_edit.php
@@ -143,9 +143,19 @@ class page_action extends tform_actions {
if($app->tform->errorMessage == '') {
$server_config_array[$section] = $app->tform->encode($this->dataRecord, $section);
- $server_config_str = $app->ini_parser->get_ini_string($server_config_array);
+ if ((! is_array($server_config_array[$section])) || count($server_config_array[$section]) == 0 ) {
+ $errMsg = sprintf( $app->tform->lng("server_config_error_section_not_updated"), $section );
+ $app->tpl->setVar('error', $errMsg);
+ } else {
+ $server_config_str = $app->ini_parser->get_ini_string($server_config_array);
- $app->db->datalogUpdate('server', array("config" => $server_config_str), 'server_id', $server_id);
+ if (count($server_config_array) == 0 || $server_config_str == '') {
+ $app->tpl->setVar('error', $app->tform->lng("server_config_error_not_updated"));
+ } else {
+ $app->db->datalogUpdate('server', array("config" => $server_config_str), 'server_id', $server_id);
+ $app->tpl->setVar('error', '');
+ }
+ }
} else {
$app->error('Security breach!');
}
diff --git a/interface/web/admin/templates/server_ip_map_list.htm b/interface/web/admin/templates/server_ip_map_list.htm
index ea23856022c5b328ad1e3a00a17237c700b349a3..527ef69b9aafec1ea8312d0a655983e456729922 100644
--- a/interface/web/admin/templates/server_ip_map_list.htm
+++ b/interface/web/admin/templates/server_ip_map_list.htm
@@ -38,13 +38,13 @@
</tmpl_loop>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
<tfoot>
<tr>
- <td colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="5"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
diff --git a/interface/web/admin/templates/server_php_list.htm b/interface/web/admin/templates/server_php_list.htm
index dd6547ba56dd7bfcafc1526155f92789bcdd549d..a2595a84741a2b729a1f55e12af7e5b1f09ce3f1 100644
--- a/interface/web/admin/templates/server_php_list.htm
+++ b/interface/web/admin/templates/server_php_list.htm
@@ -48,13 +48,13 @@
</tmpl_loop>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
<tfoot>
<tr>
- <td colspan="4"><tmpl_var name="paging"></td>
+ <td colspan="6"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 5b45ffb972f58734121c712bc9e55a0b3caab92f..17b9e623b66cda763d4db8561d101b5f33fcad8d 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -390,8 +390,8 @@ $form["tabs"]['address'] = array (
2 => array( 'event' => 'SAVE',
'type' => 'TOLOWER')
),
- 'validators' => array (
- 0 => array ( 'type' => 'ISEMAIL', 'errmsg'=> 'email_error_isemail'),
+ 'validators' => array (
+ 0 => array ( 'type' => 'ISEMAILADDRESS', 'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'NOTEMPTY',
'errmsg'=> 'email_error_empty'),
),
@@ -621,7 +621,7 @@ $form["tabs"]['address'] = array (
'type' => 'TOLOWER')
),
'validators' => array (
- 0 => array ( 'type' => 'ISEMAIL', 'allowempty' => 'y', 'errmsg'=> 'email_error_isemail'),
+ 0 => array ( 'type' => 'ISEMAILADDRESS', 'allowempty' => 'y', 'errmsg'=> 'email_error_isemail'),
),
'default' => '',
'value' => '',
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index deefcd8ade742961ae9183bc5d7c93d5e0e501ea..2fcd02606f3472c42252bb5d18b434717993f9cd 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 8b024de0eba4fd8cc7bd54c70069b751a34617c6..dcaba08f8b8576bec2bc52805df75341325dbbac 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index ba26b615133a661011690758ad67dd9ab804b3bd..46ad85698b8d8d49d22ecfd4de9cece5aa717be6 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -150,7 +150,7 @@ $wb['aps_limits_txt'] = 'Limites de instalações de APPs';
$wb['limit_aps_txt'] = 'Limite de instâncias de APPs';
$wb['limit_aps_error_notint'] = 'O limite de instâncias de APPs deve ser um número.';
$wb['default_slave_dnsserver_txt'] = 'Servidor dns secundário padrão';
-$wb['locked_txt'] = 'Bloqueado (desabilita todos os sites, etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Cancelado (desabilita o acesso do cliente.)';
$wb['gender_txt'] = 'TÃtulo';
$wb['gender_m_txt'] = 'Sr.';
diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng
index 1797c17cd706c0b7948a4476844056b4842e3543..e4cc2f2dbe8abe53e47b862059d98c0a6ed859ec 100644
--- a/interface/web/client/lib/lang/ca_client.lng
+++ b/interface/web/client/lib/lang/ca_client.lng
@@ -144,7 +144,7 @@ $wb['aps_limits_txt'] = 'Nombre max d\'Installeur APS';
$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre';
$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
-$wb['locked_txt'] = 'Vérouillé (Désactive web, etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (Désactive connexion Ispconfig)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 355611f50ed744f06d14de52f1cdab053419ac44..5d26a51cdabb6bdb8d8a1067de85224f18dddd6f 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -144,7 +144,7 @@ $wb['aps_limits_txt'] = 'APS limity instalátoru';
$wb['limit_aps_txt'] = 'Max. poÄet APS instalacÃ';
$wb['limit_aps_error_notint'] = 'Limit pro APS instalace musà být ÄÃslo.';
$wb['default_slave_dnsserver_txt'] = 'Výchozà sekundárnà DNS server';
-$wb['locked_txt'] = 'ZamÄeno (zakáže vÅ¡echny weby atd.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Zrušeno (zakáže přihlášenà klienta)';
$wb['gender_txt'] = 'OslovenÃ';
$wb['gender_m_txt'] = 'Pan';
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 58e390c9f28202fc5976f56397506f1921c5ddbc..ca22ce638cf7c28d3dd33e717df4e8c25bbfd3a0 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -147,7 +147,7 @@ $wb['aps_limits_txt'] = 'APS Installationsassistent Limits';
$wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
$wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
$wb['default_slave_dnsserver_txt'] = 'Standard Secondary DNS Server';
-$wb['locked_txt'] = 'Gesperrt (deaktiviert alle Webs, etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Gekündigt (verhindert Kundenlogin)';
$wb['gender_txt'] = 'Anrede';
$wb['gender_m_txt'] = 'Herr';
diff --git a/interface/web/client/lib/lang/dk_client.lng b/interface/web/client/lib/lang/dk_client.lng
index c0e8734912bca3ad4a9789e8d057c5c78199256d..b1e549dd9129065e21ab1e82fc125ce56e40785c 100644
--- a/interface/web/client/lib/lang/dk_client.lng
+++ b/interface/web/client/lib/lang/dk_client.lng
@@ -144,7 +144,7 @@ $wb['aps_limits_txt'] = 'APS Installer Begrænsninger';
$wb['limit_aps_txt'] = 'Max. antal af APS forekomster';
$wb['limit_aps_error_notint'] = 'APS forekomster grænse skal være et tal.';
$wb['default_slave_dnsserver_txt'] = 'Standard Sekundær DNS Server';
-$wb['locked_txt'] = 'LÃ¥st (deaktiverer alle webs mv)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Annulleret (deaktivere kunde log ind)';
$wb['gender_txt'] = 'Titel';
$wb['gender_m_txt'] = 'Hr.';
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 59d50b3c85b3dec21acb7e49b54f4e4e6b24ae2a..51f75bff055ae1f0e8020ab46de3d508f61c17ac 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index 9b114d4e640fe04ae1e5993c54ed5343ae15c663..797161d7916f6c13efda59e2193fbbbae633b936 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -151,7 +151,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb["default_slave_dnsserver_txt"] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 2595853096c9597f76a404154c244e66da7717a1..eae85315b68df4ae44d6ba5bb314aaa901c0ec90 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -146,7 +146,7 @@ $wb['limit_xmpp_status_txt'] = 'Host de estado disponible';
$wb['limit_xmpp_user_error_notint'] = 'El lÃmite de usuarios XMPP debe ser un número.';
$wb['limit_xmpp_user_txt'] = 'Número máximo de cuentas XMPP';
$wb['limit_xmpp_vjud_txt'] = 'Directorio de usuarios VJUD disponible';
-$wb['locked_txt'] = 'Bloqueado (desactivar sitios web etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['mail_servers_placeholder'] = 'Seleccionar servidores de correo';
$wb['mail_servers_txt'] = 'Servidores de correo';
$wb['mail_servers_used'] = 'El servidor que está intentando borrar de este cliente está siendo utilizado como servidor de correo. Por favor asegúrese de que este servidor no esté siendo utilizado por este cliente antes de borrarlo.';
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 65893189b370e9aa040204c3b7bf42ddb42addb9..751b7e7836059067177f89009cb79146adfec145 100644
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 10f212e0f1735d699ecd17e5ff6d1578d0c9e2b4..c3de724d93f39b704d75c9b21a5e3c08a743b35d 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -144,7 +144,7 @@ $wb['aps_limits_txt'] = 'Nombre max d’Installeur APS';
$wb['limit_aps_txt'] = 'Nombre max d’instances APS';
$wb['limit_aps_error_notint'] = 'La limite d’instances APS doit être un nombre';
$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Titre';
$wb['gender_m_txt'] = 'Monsieur';
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 9975861bdeb2933f3cd2d820aadb9396b06c1b67..4d16bac0cb308c935300d320577893d89bf34c5f 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index b74881e9bf9170eafd0d4555e0a33975ee7250de..cd491f7b00284fcc0c70ce5018c1318e0b2d7442 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index b9cec3c1e67fa40d351a56b77a1167a5913c9ab8..2b3c00bfe35862fba5cf67eebdbe20a1dde4b4f7 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 09c93513ae51424d672747f896ea966a46fee1df..8491d54f205129fa8cb00d2207b2e58a189dedbe 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -144,7 +144,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Bloccato (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Cancellato(disables client login)';
$wb['gender_txt'] = 'Titolo';
$wb['gender_m_txt'] = 'Sig.';
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index 41023dd0a65663b60440dfa3947b197b35339773..cb1a7c266435163f3fb5e58280d2c5f9bf36ca2a 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 4d6f11ca5199bdaade61b8aa0506dff6abf0729c..6dfc1a8525ae4cbbebe8e9aa608c67f6c4685c72 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -147,7 +147,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 5fcf7a26d4761f440a0b26d2b916e1556081040b..89fafa6776c3239f4c2a4f976b488021a4ae9dd1 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'Limity Instalatora APS';
$wb['limit_aps_txt'] = 'Maks. liczba instalacji APS';
$wb['limit_aps_error_notint'] = 'Limit instalacji APS musi być liczbą';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index a3f98566eeadb43259a5e483da77d08023a4a503..cccd950d3f635bfc0923b57733cc7c72cd5fc209 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 0b7c552b37528d1295b729e7a6fd4776f54ebcfa..6dd6da9dad31e7ba14b8fe2f0a3710ed92b42263 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 94d0bb6a0db1c50db635cc282798cf344f48174e..080512f5b0ad166ed99cdc9810aacafb50e2f759 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'Лимиты УÑтановщика APS';
$wb['limit_aps_txt'] = 'МакÑ. количеÑтво ÑкземплÑров APS';
$wb['limit_aps_error_notint'] = 'Лимит ÑкземплÑров APS должен быть чиÑлом.';
$wb['default_slave_dnsserver_txt'] = 'Вторичный DNS-Ñервер по умолчанию';
-$wb['locked_txt'] = 'Заблокировано (Отключены вÑе web-Ñайты и Ñ‚.д.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Отменено (отключен вход Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð²)';
$wb['gender_txt'] = 'Обращение';
$wb['gender_m_txt'] = 'Г-н.';
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index fb1151ed8ef13bb5fd098979ad80e2b563bdef25..6e0f025f90d2f7358e49c50d3cfc2e9df861553b 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Förvald sekundär DNS-server';
-$wb['locked_txt'] = 'LÃ¥st (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Uppsagd (disables client login)';
$wb['gender_txt'] = 'Titel';
$wb['gender_m_txt'] = 'Herr';
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index dcd291bc533a0e2570b66a6503df95a7360fa373..b215eb2b32fc27591d6e9b600dd35d2624705ec5 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -146,7 +146,7 @@ $wb['aps_limits_txt'] = 'APS Installer Limits';
$wb['limit_aps_txt'] = 'Max. number of APS instances';
$wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'Canceled (disables client login)';
$wb['gender_txt'] = 'Title';
$wb['gender_m_txt'] = 'Mr.';
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 9e8e6b9be35e0926c2dcaaa9f9654efad421c38f..d87fe26da90ab23836ef720031cf9f2498f04f90 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -151,7 +151,7 @@ $wb['aps_limits_txt'] = 'APS Yükleyici Sınırları';
$wb['limit_aps_txt'] = 'En Fazla APS Kopyası Sayısı';
$wb['limit_aps_error_notint'] = 'APS kopya sayısı sınırı bir sayı olmalıdır.';
$wb['default_slave_dnsserver_txt'] = 'Varsayılan İkincil DNS Sunucusu';
-$wb['locked_txt'] = 'Kilitli<br/>(tüm web vb. devre dışı)';
+$wb['locked_txt'] = 'Locked (disables everything except DNS)';
$wb['canceled_txt'] = 'İptal<br/>(müşteri oturumu devre dışı)';
$wb['gender_txt'] = 'Unvan';
$wb['gender_m_txt'] = 'Bay';
diff --git a/interface/web/help/faq_delete.php b/interface/web/help/faq_delete.php
index c1faed60d99afdad537d4447cd009d2f7e49ff50..161b1ce45b471d4a98dcbcce366c258fbbb7e157 100644
--- a/interface/web/help/faq_delete.php
+++ b/interface/web/help/faq_delete.php
@@ -11,6 +11,9 @@ require_once '../../lib/app.inc.php';
// Check module permissions
$app->auth->check_module_permissions('admin');
+// Do not allow FAQ editor in DEMO mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
// Load the form
$app->uses('tform_actions');
$app->tform_actions->onDelete();
diff --git a/interface/web/help/faq_edit.php b/interface/web/help/faq_edit.php
index 397f5cccf4233b4a5cefb4485a1f27617d68a1cf..e0f0380f8cdfa59eaf52d246da0364751e1706a6 100644
--- a/interface/web/help/faq_edit.php
+++ b/interface/web/help/faq_edit.php
@@ -10,6 +10,9 @@ require_once '../../lib/app.inc.php';
// Check the module permissions and redirect if not allowed.
$app->auth->check_module_permissions('admin');
+// Do not allow FAQ editor in DEMO mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
// Load the templating and form classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');
diff --git a/interface/web/help/faq_sections_delete.php b/interface/web/help/faq_sections_delete.php
index 865071ff252cc507ef6748322f38cfa341e648d9..76ff1c75a10dd0eb4b102b67be8caeb1068ba77e 100644
--- a/interface/web/help/faq_sections_delete.php
+++ b/interface/web/help/faq_sections_delete.php
@@ -11,6 +11,9 @@ require_once '../../lib/app.inc.php';
// Check module permissions
$app->auth->check_module_permissions('admin');
+// Do not allow FAQ editor in DEMO mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
// Load the form
$app->uses('tform_actions');
$app->tform_actions->onDelete();
diff --git a/interface/web/help/faq_sections_edit.php b/interface/web/help/faq_sections_edit.php
index f146db8605dd34e9c9980871f4a88923c431c9b5..56b3c77487291325ca41e8e2dc7f57b5431f6220 100644
--- a/interface/web/help/faq_sections_edit.php
+++ b/interface/web/help/faq_sections_edit.php
@@ -10,6 +10,9 @@ require_once '../../lib/app.inc.php';
// Check the module permissions and redirect if not allowed.
$app->auth->check_module_permissions('admin');
+// Do not allow FAQ editor in DEMO mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
// Load the templating and form classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');
diff --git a/interface/web/mail/form/mail_domain_catchall.tform.php b/interface/web/mail/form/mail_domain_catchall.tform.php
index 72261e05e0f7d496dc7581f7683ad027fa42c5d7..c43aeb333902a9abe52bb1f7e0f1c5da0d8aa009 100644
--- a/interface/web/mail/form/mail_domain_catchall.tform.php
+++ b/interface/web/mail/form/mail_domain_catchall.tform.php
@@ -113,7 +113,7 @@ $form["tabs"]['catchall'] = array (
'valuefield' => 'email'
),
*/
- 'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
+ 'validators' => array ( 0 => array ( 'type' => 'ISEMAILADDRESS',
'errmsg'=> 'destination_error_isemail'),
),
'value' => '',
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index 6d800de57e3b1397247ffb216fd3925c72b4e2ad..69291f4be81b4933ebbd824c7972116b893819b1 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -21,12 +21,12 @@
</div>
</tmpl_if>
<p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-
+
<button class="btn btn-default formbutton-success" type="button" data-load-content="mail/mail_user_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-
-
-
+
+
+
<p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
@@ -60,11 +60,7 @@
<tmpl_loop name="records">
<tr>
<td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='email'}">{tmpl_var name="email"}</a></td>
- <tmpl_if name="enable_custom_login">
- <td>
- <a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a>
- </td>
- </tmpl_if>
+ <tmpl_if name="enable_custom_login"><td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="login"}</a></td></tmpl_if>
<td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="name"}</a></td>
<td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="autoresponder"}</a></td>
<td><a href="#" data-load-content="mail/mail_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="postfix"}</a></td>
diff --git a/interface/web/mailuser/mail_user_autoresponder_edit.php b/interface/web/mailuser/mail_user_autoresponder_edit.php
index d93151bf24094f72829e2da89dcfb5321b6ee413..827a585e509edfb5fb261d810d4dd6501f290521 100644
--- a/interface/web/mailuser/mail_user_autoresponder_edit.php
+++ b/interface/web/mailuser/mail_user_autoresponder_edit.php
@@ -66,6 +66,12 @@ class page_action extends tform_actions {
if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) {
$this->dataRecord['autoresponder_start_date'] = array_map(create_function('$item', 'return 0;'), $this->dataRecord['autoresponder_start_date']);
$this->dataRecord['autoresponder_end_date'] = array_map(create_function('$item', 'return 0;'), $this->dataRecord['autoresponder_end_date']);
+
+ /* To be used when we go to PHP 7.x as min PHP version
+ $this->dataRecord['autoresponder_start_date'] = array_map( function ('$item') { 'return 0;' }, $this->dataRecord['autoresponder_start_date']);
+ $this->dataRecord['autoresponder_end_date'] = array_map( function ('$item') { 'return 0;' }, $this->dataRecord['autoresponder_end_date']);
+ */
+
}
parent::onSubmit();
diff --git a/interface/web/monitor/dataloghistory_view.php b/interface/web/monitor/dataloghistory_view.php
index 2b5ea1e0323c4dbe135baaacaef6f26a7ed1ef54..b86334b0af38f8052914436228385fbd564ec348 100644
--- a/interface/web/monitor/dataloghistory_view.php
+++ b/interface/web/monitor/dataloghistory_view.php
@@ -50,9 +50,48 @@ $id = intval($_GET['id']);
$record = $app->db->queryOneRecord('SELECT * FROM sys_datalog WHERE datalog_id = ?', $id);
$out['id'] = $id;
+$out['username'] = $record['user'];
$out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
$out['table'] = $record['dbtable'];
+list($key, $value) = explode(':', $record['dbidx']);
+if (!empty($value)) {
+ if ($record['action'] == 'd') {
+ // No link for deleted content.
+ $out['table_id'] = $record['dbidx'];
+ } else {
+ switch ($out['table']) {
+ case 'mail_forwarding':
+ $file = 'mail/mail_forward_edit.php';
+ break;
+ case 'mail_user':
+ $file = 'mail/mail_user_edit.php';
+ break;
+ case 'mail_domain':
+ $file = 'mail/mail_domain_edit.php';
+ break;
+ case 'web_domain':
+ $file = 'sites/web_vhost_domain_edit.php';
+ break;
+ case 'web_database':
+ $file = 'sites/database_edit.php';
+ break;
+ case 'web_database_user':
+ $file = 'sites/database_user_edit.php';
+ break;
+
+ // TODO Add a link per content type
+ default:
+ $file = '';
+ }
+
+ if (!empty($file)) {
+ $out['table_id'] = '<a href="#" data-load-content="' . $file . '?id=' . $value
+ . '" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="link">'
+ . $record['dbidx'] . '</a>';
+ }
+ }
+}
$out['action_char'] = $record['action'];
$out['action_name'] = $app->lng($record['action']);
diff --git a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
index df9ddd286f46e816e06132e7465929ab8dd87229..3d5d6829aeb76a374815c411b2d59fcb146ac0b3 100644
--- a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
+++ b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
@@ -23,4 +23,5 @@ $wb['new_txt'] = 'New';
$wb['btn_cancel_txt'] = 'Back';
$wb['undo_txt'] = 'Undo action';
$wb['undo_confirmation_txt'] = 'Do you really want to undo this action?';
+$wb['username_txt'] = 'Username';
?>
diff --git a/interface/web/monitor/templates/dataloghistory_view.htm b/interface/web/monitor/templates/dataloghistory_view.htm
index 4ba82bbf052a8aa7375d780a7b1c440c7cd2a8e0..9741d70be822c0afcf07fe7ec77471c2b5da5b51 100644
--- a/interface/web/monitor/templates/dataloghistory_view.htm
+++ b/interface/web/monitor/templates/dataloghistory_view.htm
@@ -12,13 +12,17 @@
</tr>
</thead>
<tbody>
+ <tr>
+ <td><tmpl_var name="username_txt"></td>
+ <td><tmpl_var name="username"></td>
+ </tr>
<tr>
<td><tmpl_var name="timestamp_txt"></td>
<td><tmpl_var name="timestamp"></td>
</tr>
<tr>
<td><tmpl_var name="table_txt"></td>
- <td><tmpl_var name="table"></td>
+ <td><tmpl_var name="table"><tmpl_if name='table_id'> (<tmpl_var name="table_id">)</tmpl_if></td>
</tr>
<tr>
<td><tmpl_var name="action_txt"></td>
diff --git a/interface/web/remote/monitor.php b/interface/web/remote/monitor.php
index 132bcf29a5bc01a297eaf488565cd4db340fd810..914a09382ea4fa65d1442912d8fb42436e67ef09 100644
--- a/interface/web/remote/monitor.php
+++ b/interface/web/remote/monitor.php
@@ -59,73 +59,6 @@ if($token == '' or $secret == '' or $token != $secret) {
}
}
$out['type'] = $type;
-
-function __json_encode($data) {
- if( is_array($data) || is_object($data) ) {
- $islist = is_array($data) && ( empty($data) || array_keys($data) === range(0, count($data)-1) );
-
- if( $islist ) {
- $json = '[' . implode(',', array_map('__json_encode', $data) ) . ']';
- } else {
- $items = array();
- foreach( $data as $key => $value ) {
- $items[] = __json_encode("$key") . ':' . __json_encode($value);
- }
- $json = '{' . implode(',', $items) . '}';
- }
- } elseif( is_string($data) ) {
- // Escape non-printable or Non-ASCII characters.
- // I also put the \\ character first, as suggested in comments on the 'addcslashes' page.
- $string = '"' . addcslashes($data, "\\\"\n\r\t/" . chr(8) . chr(12)) . '"';
- $json = '';
- $len = strlen($string);
- // Convert UTF-8 to Hexadecimal Codepoints.
- for( $i = 0; $i < $len; $i++ ) {
-
- $char = $string[$i];
- $c1 = ord($char);
-
- // Single byte;
- if( $c1 <128 ) {
- $json .= ($c1 > 31) ? $char : sprintf("\\u%04x", $c1);
- continue;
- }
-
- // Double byte
- $c2 = ord($string[++$i]);
- if ( ($c1 & 32) === 0 ) {
- $json .= sprintf("\\u%04x", ($c1 - 192) * 64 + $c2 - 128);
- continue;
- }
-
- // Triple
- $c3 = ord($string[++$i]);
- if( ($c1 & 16) === 0 ) {
- $json .= sprintf("\\u%04x", (($c1 - 224) <<12) + (($c2 - 128) << 6) + ($c3 - 128));
- continue;
- }
-
- // Quadruple
- $c4 = ord($string[++$i]);
- if( ($c1 & 8 ) === 0 ) {
- $u = (($c1 & 15) << 2) + (($c2>>4) & 3) - 1;
-
- $w1 = (54<<10) + ($u<<6) + (($c2 & 15) << 2) + (($c3>>4) & 3);
- $w2 = (55<<10) + (($c3 & 15)<<6) + ($c4-128);
- $json .= sprintf("\\u%04x\\u%04x", $w1, $w2);
- }
- }
- } else {
- // int, floats, bools, null
- $json = strtolower(var_export( $data, true ));
- }
- return $json;
-}
-
-if(function_exists('json_encode')) { // PHP >= 5.2
- echo json_encode($out);
-} else { // PHP < 5.2
- echo __json_encode($out);
-}
+echo json_encode($out);
exit;
?>
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
index 534d2390f81541968bb372e21481179d5e9fe10e..c255573e6c5560d69bc99ef7ef6e7bc20ca3edbc 100644
--- a/interface/web/themes/default/assets/stylesheets/ispconfig.css
+++ b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -141,7 +141,9 @@ body {
#sidebar {
margin-top: 27px;
- width: 18%;
+ min-width: 18%;
+ max-width: 21%;
+ width: auto;
border-style: solid;
border-width: 1px;
border-radius: 4px; }
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 6acb16f7c8bac0a99cbf17084e786c9e8bacacce..e30ccd6d3bc6235d79902b0472ccb4d13bb8d1b1 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -132,7 +132,7 @@ Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-know
Allow from all
</tmpl_if>
<IfModule mpm_itk_module>
- AssignUserId www-data www-data
+ AssignUserId <tmpl_var name='system_user'> <tmpl_var name='system_group'>
</IfModule>
</Directory>
diff --git a/server/cron.php b/server/cron.php
index ef13d06e2f3b072c4d806db6f236325e25153339..0fe1dfc6cfbaf380b49a8780708080fe884bc4dc 100644
--- a/server/cron.php
+++ b/server/cron.php
@@ -128,6 +128,6 @@ $app->services->processDelayedActions();
@unlink($conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock');
$app->log('Remove Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_cron_lock', LOGLEVEL_DEBUG);
-if($conf['log_priority'] <= LOGLEVEL_DEBUG) die("finished.\n");
+if($conf['log_priority'] <= LOGLEVEL_DEBUG) die("finished cron run.\n");
?>
diff --git a/server/cron_debug.php b/server/cron_debug.php
index fbf59ebc2606fbd8525fd908285826f887db5055..de561577c8befa20b7ae35632b90f03e211ce36a 100644
--- a/server/cron_debug.php
+++ b/server/cron_debug.php
@@ -39,25 +39,20 @@ ini_set('error_reporting', E_ALL & ~E_NOTICE);
$conf['server_id'] = intval($conf['server_id']);
// Load required base-classes
-$app->uses('ini_parser,file,services,getconf,system,cron,functions');
+$app->uses('modules,plugins,ini_parser,file,services,getconf,system,cron,functions');
$app->load('libdatetime,cronjob');
// Path settings
$path = SCRIPT_PATH . '/lib/classes/cron.d';
//** Get commandline options
-$cmd_opt = getopt('', array('cronjob::', 'force', 'firstrun'));
+$cmd_opt = getopt('', array('cronjob::'));
if(isset($cmd_opt['cronjob']) && is_file($path.'/'.$cmd_opt['cronjob'])) {
// Cronjob that shell be run
$cronjob_file = $cmd_opt['cronjob'];
} else {
- echo "Usage example: php cron_debug.php --cronjob=100-mailbox_stats.inc.php [--force] [--firstrun]\n" ;
- echo "Available cronjobs:\n";
- foreach(glob($path.'/*-*.inc.php') as $cronjob) {
- echo basename($cronjob)."\n";
- }
- die();
+ die('Usage example: php cron_debug.php --cronjob=100-mailbox_stats.inc.php');
}
// Load and run the cronjob
@@ -66,20 +61,8 @@ if(preg_match('/^\d+\-(.*)$/', $name, $match)) $name = $match[1]; // strip numer
include $path . '/' . $cronjob_file;
$class_name = 'cronjob_' . $name;
$cronjob = new $class_name();
+$cronjob->run(true);
-if(isset($cmd_opt['force'])) {
- $app->db->query("UPDATE `sys_cron` SET `running` = 0 WHERE `name` = ?", $class_name);
-}
-
-$cronjob->onPrepare();
-$cronjob->onBeforeRun(isset($cmd_opt['firstrun']));
-if(!$cronjob->isRunning()) {
- $app->db->query("UPDATE `sys_cron` SET `running` = ? WHERE `name` = ?", ($cronjob->canBeRunInParallel() !== true ? "1" : "0"), $class_name);
- $cronjob->onRunJob();
- $cronjob->onAfterRun();
- $cronjob->onCompleted();
-}
-
-die("finished.\n");
+die("finished cron debug.\n");
-?>
\ No newline at end of file
+?>
diff --git a/server/lib/classes/backup.inc.php b/server/lib/classes/backup.inc.php
index f996340bd5de9a29ce8b7ef5576e51559c5554b1..ba28cd4c90559b0a2f323517eb929cfe4ea554c9 100644
--- a/server/lib/classes/backup.inc.php
+++ b/server/lib/classes/backup.inc.php
@@ -856,6 +856,10 @@ class backup
if (is_null($endings_list))
$endings_list = $default_endings_list;
+ if (!is_dir($directory)) {
+ return array();
+ }
+
$dir_handle = dir($directory);
$files = array();
while (false !== ($entry = $dir_handle->read())) {
diff --git a/server/lib/classes/cron.d/100-monitor_email_quota.inc.php b/server/lib/classes/cron.d/100-monitor_email_quota.inc.php
index 8adf7c7253f37a0ba03edc09065da8a38c1468fd..40736a7bac8f976f922befecbcfab68073d22f84 100644
--- a/server/lib/classes/cron.d/100-monitor_email_quota.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_email_quota.inc.php
@@ -79,30 +79,40 @@ class cronjob_monitor_email_quota extends cronjob {
if(is_array($mailboxes)) {
//* with dovecot we can use doveadm instead of 'du -s'
- $dovecot = false;
- if (isset($mail_config['pop3_imap_daemon']) && $mail_config ['pop3_imap_daemon'] = 'dovecot' && is_executable('doveadm')) {
- exec('doveadm quota 2>&1', $tmp_output, $tmp_retval); // with dovecot 2.2.x 'doveadm quota' is unuseable
- if ($retval = 64) $dovecot = true;
+ $dovecotQuotaUsage = array();
+ if (isset($mail_config['pop3_imap_daemon']) && $mail_config ['pop3_imap_daemon'] = 'dovecot') {
+ exec("doveadm quota get -A 2>&1", $res, $retval);
+ if ($retval = 64) {
+ foreach ($res as $v) {
+ $s = preg_split('/\s+/', $v);
+ if ($s[2] == 'STORAGE') {
+ $dovecotQuotaUsage[$s[0]] = $s[3] * 1024; // doveadm output is in kB
+ } elseif ($s[3] == 'STORAGE') {
+ $dovecotQuotaUsage[$s[0]] = $s[4] * 1024; // doveadm output is in kB
+ }
+ }
+ }
}
foreach($mailboxes as $mb) {
$email = $mb['email'];
$email_parts = explode('@', $mb['email']);
$filename = $mb['maildir'].'/.quotausage';
- if(!file_exists($filename) && $dovecot) {
- $app->system->exec_safe('doveadm quota recalc -u ?', $email);
- }
- if(file_exists($filename) && !is_link($filename)) {
+ if(count($dovecotQuotaUsage) > 0 && isset($dovecotQuotaUsage[$email])) {
+ $data[$email]['used'] = $dovecotQuotaUsage[$email];
+ $app->log("Mail storage $email: " . $data[$email]['used'], LOGLEVEL_DEBUG);
+ } elseif(file_exists($filename) && !is_link($filename)) {
$quotafile = file($filename);
preg_match('/storage.*?([0-9]+)/s', implode('',$quotafile), $storage_value);
$data[$email]['used'] = $storage_value[1];
- $app->log("Mail storage $email: " . $storage_value[1], LOGLEVEL_DEBUG);
+ $app->log("Mail storage $email: " . $data[$email]['used'], LOGLEVEL_DEBUG);
unset($quotafile);
} else {
$app->system->exec_safe('du -s ?', $mb['maildir']);
$out = $app->system->last_exec_out();
$parts = explode(' ', $out[0]);
$data[$email]['used'] = intval($parts[0])*1024;
+ $app->log("Mail storage $email: " . $data[$email]['used'], LOGLEVEL_DEBUG);
unset($out);
unset($parts);
}
@@ -110,6 +120,7 @@ class cronjob_monitor_email_quota extends cronjob {
}
unset($mailboxes);
+ unset($dovecotQuotaUsage);
//* Dovecot quota check Courier in progress lathama@gmail.com
/*
@@ -132,8 +143,8 @@ class cronjob_monitor_email_quota extends cronjob {
$res['state'] = $state;
/*
- * Insert the data into the database
- */
+ * Insert the data into the database
+ */
$sql = 'REPLACE INTO monitor_data (server_id, type, created, data, state) ' .
'VALUES (?, ?, UNIX_TIMESTAMP(), ?, ?)';
$app->dbmaster->query($sql, $res['server_id'], $res['type'], serialize($res['data']), $res['state']);
diff --git a/server/lib/classes/cron.d/100-monitor_fail2ban.inc.php b/server/lib/classes/cron.d/100-monitor_fail2ban.inc.php
index 5c4ba80561b222b6be12a1dc5f8f02951a91ab64..a25d5c710666ce802e1993ca8a6adb708dd1a3d8 100644
--- a/server/lib/classes/cron.d/100-monitor_fail2ban.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_fail2ban.inc.php
@@ -67,10 +67,8 @@ class cronjob_monitor_fail2ban extends cronjob {
$type = 'log_fail2ban';
/* This monitoring is only available if fail2ban is installed */
- system('which fail2ban-client', $retval); // Debian, Ubuntu, Fedora
- if ($retval !== 0)
- system('which fail2ban', $retval); // CentOS
- if ($retval === 0) {
+ if ($app->system->is_installed('fail2ban-client') // Debian, Ubuntu, Fedora
+ || $app->system->is_installed('fail2ban')) { // CentOS
/* Get the data of the log */
$data = $this->_tools->_getLogData($type);
diff --git a/server/lib/classes/cron.d/100-monitor_iptables.inc.php b/server/lib/classes/cron.d/100-monitor_iptables.inc.php
index 1ad11d9ecccdcbf690c3337524221aee62b431f8..cff0a73ac3747e1b0e1b867af5ca4a85e9a58179 100644
--- a/server/lib/classes/cron.d/100-monitor_iptables.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_iptables.inc.php
@@ -67,8 +67,7 @@ class cronjob_monitor_iptables extends cronjob {
$type = 'iptables_rules';
/* This monitoring is only available if fail2ban is installed */
- system('which iptables', $retval); // Debian, Ubuntu, Fedora
- if ($retval === 0) {
+ if ($app->system->is_installed('iptables')) {
/* Get the data of the log */
$data['output'] = '<h2>iptables -S (ipv4)</h2>'.shell_exec('iptables -S 2>/dev/null');
@@ -83,8 +82,7 @@ class cronjob_monitor_iptables extends cronjob {
/* This monitoring is only available if fail2ban is installed */
- system('which ip6tables', $retval); // Debian, Ubuntu, Fedora
- if ($retval === 0) {
+ if ($app->system->is_installed('ip6tables')) {
/* Get the data of the log */
$data['output'] .= '<br><h2>ip6tables -S (ipv6)</h2>'.shell_exec('ip6tables -S 2>/dev/null');
diff --git a/server/lib/classes/cron.d/100-monitor_raid.inc.php b/server/lib/classes/cron.d/100-monitor_raid.inc.php
index d1a9a53455c6a70e2efab0a561c1d7e21b1e6404..80ab29b6c36cb23c59c01ddc96f8ba2f9398e83a 100644
--- a/server/lib/classes/cron.d/100-monitor_raid.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_raid.inc.php
@@ -126,8 +126,7 @@ class cronjob_monitor_raid extends cronjob {
* Check, if we have mpt-status installed (LSIsoftware-raid)
*/
if (file_exists('/proc/mpt/summary')) {
- system('which mpt-status', $retval);
- if ($retval === 0) {
+ if ($app->system->is_installed('mpt-status')) {
/*
* Fetch the output
*/
@@ -174,8 +173,7 @@ class cronjob_monitor_raid extends cronjob {
/*
* 3ware Controller
*/
- system('which tw_cli', $retval);
- if($retval === 0) {
+ if($app->system->is_installed('tw_cli')) {
// TYPOWORX FIX | Determine Controler-ID
$availableControlers = shell_exec('tw_cli info | grep -Eo "c[0-9]+"');
@@ -232,8 +230,7 @@ class cronjob_monitor_raid extends cronjob {
/*
* HP Proliant
*/
- system('which hpacucli', $retval);
- if($retval === 0) {
+ if($app->system->is_installed('hpacucli')) {
$state = 'ok';
$data['output'] = shell_exec('/usr/sbin/hpacucli ctrl all show config');
$tmp = explode("\n", $data['output']);
@@ -278,10 +275,14 @@ class cronjob_monitor_raid extends cronjob {
/*
* LSI MegaRaid
*/
- system('which megacli', $retval);
- system('which megacli64', $retval64);
- if($retval === 0 || $retval64 === 0) {
- $binary=@($retval === 0)?'megacli':'megacli64';
+ $binary = FALSE;
+ if ($app->system->is_installed('megacli')) {
+ $binary = 'megacli';
+ }
+ if ($app->system->is_installed('megacli64')) {
+ $binary = 'megacli64';
+ }
+ if($binary) {
$state = 'ok';
$data['output'] = shell_exec($binary.' -LDInfo -Lall -aAll -NoLog');
if (strpos($data['output'], 'Optimal') !== false) {
@@ -298,8 +299,7 @@ class cronjob_monitor_raid extends cronjob {
/*
* Adaptec-RAID
*/
- system('which arcconf', $retval);
- if($retval === 0) {
+ if($app->system->is_installed('arcconf')) {
$state = 'ok';
$data['output'] = shell_exec('arcconf GETCONFIG 1 LD');
if(is_array($data['output'])) {
diff --git a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
index 43071b83872b26048266ba9250dff926c6997d95..5efb9420ec7065ba4a55bb2a4d4ba898d731b621 100644
--- a/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
+++ b/server/lib/classes/cron.d/100-monitor_rkhunter.inc.php
@@ -67,8 +67,7 @@ class cronjob_monitor_rkhunter extends cronjob {
$type = 'rkhunter';
/* This monitoring is only available if rkhunter is installed */
- system('which rkhunter', $retval);
- if ($retval === 0) {
+ if ($app->system->is_installed('rkhunter')) {
/*
* Fetch the output
*/
diff --git a/server/lib/classes/cron.d/150-awstats.inc.php b/server/lib/classes/cron.d/150-awstats.inc.php
index 4ba286ea1aefba159c0ef3ea425af4cbac4959e4..891919cb02d5e4d3b2add6deaf6ee0b9c48f631f 100644
--- a/server/lib/classes/cron.d/150-awstats.inc.php
+++ b/server/lib/classes/cron.d/150-awstats.inc.php
@@ -60,7 +60,6 @@ class cronjob_awstats extends cronjob {
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
foreach($records as $rec) {
- //$yesterday = date('Ymd',time() - 86400);
$yesterday = date('Ymd', strtotime("-1 day", time()));
$log_folder = 'log';
@@ -135,9 +134,6 @@ class cronjob_awstats extends cronjob {
}
}
- // awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/'.$web_folder.'/stats -awstatsprog=/path/to/awstats.pl
- // $command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
-
$command = escapeshellcmd($awstats_buildstaticpages_pl) . ' -month=' . escapeshellarg($awmonth) . ' -year=' . escapeshellarg($awyear) . ' -update -config=' . escapeshellarg($domain) . ' -lang=' . escapeshellarg($conf['language']) . ' -dir=' . escapeshellarg($statsdir) . ' -awstatsprog=' . escapeshellarg($awstats_pl);
if (date("d") == 2) {
diff --git a/server/lib/classes/cron.d/500-backup_mail.inc.php b/server/lib/classes/cron.d/500-backup_mail.inc.php
index 2b1fd58177fe5de45801b5db6f365fc456deb4f7..f631f0043cbba060e644ae8a0054dc1d785fe3f0 100644
--- a/server/lib/classes/cron.d/500-backup_mail.inc.php
+++ b/server/lib/classes/cron.d/500-backup_mail.inc.php
@@ -78,8 +78,7 @@ class cronjob_backup_mail extends cronjob {
} else {
chmod($backup_dir, $backup_dir_permissions);
}
- system('which pigz > /dev/null', $ret);
- if($ret === 0) {
+ if($app->system->is_installed('pigz')) {
$use_pigz = true;
} else {
$use_pigz = false;
diff --git a/server/lib/classes/cron.d/500-clean_mailboxes.inc.php b/server/lib/classes/cron.d/500-clean_mailboxes.inc.php
index 8617d0d76d0d578aa8b5de522cc5177c4aae544c..7e8c82da6419f39b187a3be808614bb8137b19d1 100755
--- a/server/lib/classes/cron.d/500-clean_mailboxes.inc.php
+++ b/server/lib/classes/cron.d/500-clean_mailboxes.inc.php
@@ -57,6 +57,7 @@ class cronjob_clean_mailboxes extends cronjob {
$junk_names=array('Junk', 'Junk Email', 'SPAM', 'INBOX.SPAM');
$purge_cmd = 'doveadm expunge -u ? mailbox ? sentbefore ';
+ $recalc_cmd = 'doveadm quota recalc -u ?';
$server_id = intval($conf['server_id']);
$records = $app->db->queryAllRecords("SELECT email, maildir, purge_trash_days, purge_junk_days FROM mail_user WHERE maildir_format = 'maildir' AND disableimap = 'n' AND server_id = ? AND (purge_trash_days > 0 OR purge_junk_days > 0)", $server_id);
@@ -77,6 +78,7 @@ class cronjob_clean_mailboxes extends cronjob {
}
}
}
+ $app->system->exec_safe($recalc_cmd, $email['email']);
}
}
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 4bbc84e3f9b1bd9be45e6795f0e484e2e6d1700e..8c381230961976b5152ae5bff25cd7fa00f3634a 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -258,6 +258,8 @@ class db
private function _query($sQuery = '') {
global $app;
+
+ $aArgs = func_get_args();
if ($sQuery == '') {
$this->_sqlerror('Keine Anfrage angegeben / No query given');
@@ -297,7 +299,6 @@ class db
}
} while($ok == false);
- $aArgs = func_get_args();
$sQuery = call_user_func_array(array(&$this, '_build_query_string'), $aArgs);
$this->securityScan($sQuery);
$this->_iQueryId = mysqli_query($this->_iConnId, $sQuery);
@@ -353,10 +354,17 @@ class db
* @return array result row or NULL if none found
*/
public function queryOneRecord($sQuery = '') {
- if(!preg_match('/limit \d+\s*(,\s*\d+)?$/i', $sQuery)) $sQuery .= ' LIMIT 0,1';
-
+
$aArgs = func_get_args();
- $oResult = call_user_func_array(array(&$this, 'query'), $aArgs);
+ if(!empty($aArgs)) {
+ $sQuery = array_shift($aArgs);
+ if($sQuery && !preg_match('/limit \d+(\s*,\s*\d+)?$/i', $sQuery)) {
+ $sQuery .= ' LIMIT 0,1';
+ }
+ array_unshift($aArgs, $sQuery);
+ }
+
+ $oResult = call_user_func_array([&$this, 'query'], $aArgs);
if(!$oResult) return null;
$aReturn = $oResult->get();
@@ -1300,7 +1308,7 @@ class fakedb_result {
if(!is_array($this->aLimitedData)) return $aItem;
- if(list($vKey, $aItem) = each($this->aLimitedData)) {
+ foreach($this->aLimitedData as $vKey => $aItem) {
if(!$aItem) $aItem = null;
}
return $aItem;
diff --git a/server/lib/classes/file.inc.php b/server/lib/classes/file.inc.php
index eadb38b789f0cfd9f80d6fd951e53be403616821..28757d0dd50b4e30baab69e29cf14d22dfb4e577 100644
--- a/server/lib/classes/file.inc.php
+++ b/server/lib/classes/file.inc.php
@@ -158,26 +158,6 @@ class file{
return $ret_val;
}
- function edit_dist($var, $val){
- global $$var;
- $files = array('/root/ispconfig/dist.inc.php');
- foreach($files as $file){
- if(is_file($file)){
- $file_content = $this->unix_nl($this->rf($file));
- $lines = explode("\n", $file_content);
- for($i=0;$i<sizeof($lines);$i++){
- $parts = explode('=', $lines[$i]);
- if($parts[0] == $var || $parts[0] == '$'.$var.' '){
- $parts[1] = str_replace($$var, $val, $parts[1]);
- }
- $lines[$i] = implode('=', $parts);
- }
- $file_content = implode("\n", $lines);
- $this->wf($file, $file_content);
- }
- }
- }
-
function getDirectoryListing($dirname, $sortorder = 'a', $show_subdirs = 0, $show_subdirfiles = 0, $exts = '', $ext_save = 1){
// This function will return an array with filenames based on the criteria you can set in the variables
// @sortorder : a for ascending (the standard) or d for descending (you can use the "r" for reverse as well, works the same)
diff --git a/server/lib/classes/monitor_tools.inc.php b/server/lib/classes/monitor_tools.inc.php
index aba19df7a4242ff8da31cbd546b896fb43608fa2..e349acd12894c2251ae619d423f0226652ada6f2 100644
--- a/server/lib/classes/monitor_tools.inc.php
+++ b/server/lib/classes/monitor_tools.inc.php
@@ -87,6 +87,10 @@ class monitor_tools {
$mainver = $ver;
}
switch ($mainver){
+ case "20.04":
+ $relname = "(Focal Fossa)";
+ $distconfid = 'ubuntu2004';
+ break;
case "18.04":
$relname = "(Bionic Beaver)";
$distconfid = 'ubuntu1804';
@@ -319,14 +323,14 @@ class monitor_tools {
} else {
$distid = 'centos72';
}
- } elseif(stristr($content, 'CentOS Linux release 8')) {
- preg_match_all('/([0-9]{1,2})\.?([0-9]{0,2})\.?([0-9]*)/', $content, $version);
- $distname = 'CentOS';
- $distver = is_array($version)? implode('.', array_filter(array($version[1][0],$version[2][0],$version[3][0]),'strlen')) :'Unknown';
- $distbaseid = 'fedora';
- $var=explode(" ", $content);
- $var=explode(".", $var[3]);
- $var=$var[0].".".$var[1];
+ } elseif(stristr($content, 'CentOS Linux release 8')) {
+ preg_match_all('/([0-9]{1,2})\.?([0-9]{0,2})\.?([0-9]*)/', $content, $version);
+ $distname = 'CentOS';
+ $distver = is_array($version)? implode('.', array_filter(array($version[1][0],$version[2][0],$version[3][0]),'strlen')) :'Unknown';
+ $distbaseid = 'fedora';
+ $var=explode(" ", $content);
+ $var=explode(".", $var[3]);
+ $var=$var[0].".".$var[1];
} else {
$distname = 'Redhat';
$distver = 'Unknown';
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 551e4e485315948f4bf1da53cabb62022dc79808..078c225c107b99f463f58a79dce0ab243b35ef47 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -2121,13 +2121,13 @@ class system{
public function exec_safe($cmd) {
global $app;
+ $args = func_get_args();
$arg_count = func_num_args();
if($arg_count != substr_count($cmd, '?') + 1) {
trigger_error('Placeholder count not matching argument list.', E_USER_WARNING);
return false;
}
if($arg_count > 1) {
- $args = func_get_args();
array_shift($args);
$pos = 0;
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 9a1f72f8b35a76997c7d624e89d47f2ed2eb941b..b969882f2b2edf294a0c6adf5902a97826793c39 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -778,7 +778,7 @@ class apache2_plugin {
$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);
$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);
//* add mountpoint to fstab
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail';
$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0';
$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
}
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index 4d0866d1de9f283d25e23c857d6b652bf6975e15..7fb55038023083c241d2813ee5d7495a1d4550ca 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -184,6 +184,7 @@ class apps_vhost_plugin {
|| file_exists('/var/run/php/php7.1-fpm.sock')
|| file_exists('/var/run/php/php7.2-fpm.sock')
|| file_exists('/var/run/php/php7.3-fpm.sock')
+ || file_exists('/var/run/php/php7.4-fpm.sock')
){
$use_tcp = '#';
$use_socket = '';
@@ -206,6 +207,8 @@ class apps_vhost_plugin {
if(file_exists('/var/run/php/php7.0-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.0-fpm.sock', $content);
if(file_exists('/var/run/php/php7.1-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.1-fpm.sock', $content);
if(file_exists('/var/run/php/php7.2-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.2-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.3-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.3-fpm.sock', $content);
+ if(file_exists('/var/run/php/php7.4-fpm.sock')) $content = str_replace('/var/run/php5-fpm.sock', '/var/run/php/php7.4-fpm.sock', $content);
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php
index 607491216db10d442d4cf0b85ccf8713bf84b092..ffbc5a6b795a7917f8b9109618efd1b509e35681 100644
--- a/server/plugins-available/backup_plugin.inc.php
+++ b/server/plugins-available/backup_plugin.inc.php
@@ -321,5 +321,4 @@ class backup_plugin {
} // end class
-?>
-
+?>
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index f2dc603ec5165def2ff160be4769ab34c0179fd2..d4b4a7c01c0516e582c1128c6180a6d3e6320aa1 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -225,7 +225,7 @@ class bind_plugin {
//* Get the bind version
$bind_caa = false;
- $bind = explode("\n", shell_exec('which named bind'));
+ $bind = explode("\n", shell_exec('which named bind 2> /dev/null'));
$bind = reset($bind);
if(is_executable($bind)) {
exec($bind . ' -v 2>&1', $tmp);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index c2a280570132c47bd85d290c5d9d8a2a1860006f..b57d38516e993febb8f7b66ef556d5f4591ae3f5 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -619,7 +619,7 @@ class nginx_plugin {
$app->system->chmod($data['new']['document_root'].'/'.$log_folder, 0755);
$app->system->exec_safe('mount --bind ? ?', '/var/log/ispconfig/httpd/'.$data['new']['domain'], $data['new']['document_root'].'/'.$log_folder);
//* add mountpoint to fstab
- $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait';
+ $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nofail';
$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0';
$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
}
diff --git a/server/server.php b/server/server.php
index 106d3edc654f4dd9974b76fca0f183d1dd2d56cd..164451babe0c8dd69c5aa82bbaed114d2e5c1a56 100644
--- a/server/server.php
+++ b/server/server.php
@@ -217,5 +217,5 @@ if ($needStartCore) {
$app->log('Remove Lock: ' . $conf['temppath'] . $conf['fs_div'] . '.ispconfig_lock', LOGLEVEL_DEBUG);
-die("finished.\n");
+die("finished server.php.\n");
?>