Merge remote-tracking branch 'origin/develop' into 5374-mail-last-accessed-frontend

Author: helmo

install/sql/incremental/upd_dev_collection.sql

@@ -3,3 +3,5 @@ INSERT IGNORE INTO `dns_ssl_ca` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
 
 -- 5374-mail-last-accessed-frontend
 ALTER TABLE `mail_user` ADD `last_access` int(11) NULL DEFAULT NULL after `disabledoveadm`;
+
+ALTER TABLE `web_domain` ADD `disable_symlinknotowner` enum('n','y') NOT NULL default 'n' AFTER `last_jailkit_hash`;

install/sql/ispconfig3.sql

@@ -2048,6 +2048,7 @@ CREATE TABLE `web_domain` (
   `delete_unused_jailkit` enum('n','y') NOT NULL default 'n',
   `last_jailkit_update` date NULL DEFAULT NULL,
   `last_jailkit_hash` varchar(255) DEFAULT NULL,
+  `disable_symlinknotowner` enum('n','y') NOT NULL default 'n',
   PRIMARY KEY  (`domain_id`),
   UNIQUE KEY `serverdomain` (  `server_id` , `ip_address`,  `domain` )
 ) ENGINE=InnoDB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

interface/web/sites/form/web_vhost_domain.tform.php

@@ -957,6 +957,12 @@
 				'width'  => '3',
 				'maxlength' => '6'
 			),
+			'disable_symlinknotowner' => array (
+				'datatype' => 'VARCHAR',
+				'formtype' => 'CHECKBOX',
+				'default' => 'n',
+				'value'  => array(0 => 'n', 1 => 'y')
+			),
 			'php_open_basedir' => array (
 				'datatype' => 'VARCHAR',
 				'formtype' => 'TEXT',

interface/web/sites/lib/lang/ar_web_vhost_domain.lng

@@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo
 $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
 $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';
+

interface/web/sites/lib/lang/bg_web_vhost_domain.lng

@@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo
 $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
 $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';
+

interface/web/sites/lib/lang/br_web_vhost_domain.lng

@@ -202,3 +202,5 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'Quando vazio, usa aplicativos
 $wb['delete_unused_jailkit_txt'] = 'Remover chroot Jailkit sem uso';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Remover o ambiente chroot Jailkit quando não há usuários Shell ou tarefas do cron que o requeiram.';
 $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';

interface/web/sites/lib/lang/ca_web_vhost_domain.lng

@@ -202,3 +202,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo
 $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
 $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';
+

interface/web/sites/lib/lang/cn_web_vhost_domain.lng

@@ -207,3 +207,6 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = '如果为空，则使用来自
 $wb['delete_unused_jailkit_txt'] = '删除未使用的jailkit chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = '删除没有需要它的shell用户或cron作业的jailkit chroot环境。';
 $wb['ssl_options_not_for_le_txt'] = '您已为此网站启用Let\'s Encrypt证书。请注意，此页面上的所有选项仅适用于非Let\'s Encrypt证书。如果要切换到不同的证书，请记得在主选项卡上取消选中Let\'s Encrypt。';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';
+

interface/web/sites/lib/lang/cz_web_vhost_domain.lng

@@ -202,3 +202,5 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'When empty, uses Jailkit chroo
 $wb['delete_unused_jailkit_txt'] = 'Delete unused jailkit chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Delete the jailkit chroot environment when there are no shell users or cron jobs which require it.';
 $wb['ssl_options_not_for_le_txt'] = 'You have Let\'s Encrypt certificates enabled for this website. Please be aware that all options on this page apply to non-Let\'s Encrypt certificates only. Remember to uncheck Let\'s Encrypt on the main tab if you want to switch to a different certificate.';
+$wb['disable_symlinknotowner_txt'] = 'Deactivate symlinks restriction of the web space';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNING: This function deactivates the restriction SymLinksIfOwnerMatch (Apache) and disable_symlinks if_not_owner (Nginx).';

interface/web/sites/lib/lang/de_web_vhost_domain.lng

@@ -202,3 +202,5 @@ $wb['tooltip_jailkit_chroot_app_programs_txt'] = 'Wenn leer, verwende Jailkit Ch
 $wb['delete_unused_jailkit_txt'] = 'Lösche unbenutzten Jailkit Chroot';
 $wb['tooltip_delete_unused_jailkit_txt'] = 'Lösche die Jailkit-Chroot-Umgebung, wenn es keine Shell-Benutzer oder Cronjobs gibt, die sie benötigen.';
 $wb['ssl_options_not_for_le_txt'] = 'Sie haben Let\'s Encrypt-Zertifikate für diese Website aktiviert. Bitte beachten Sie, dass alle Optionen auf dieser Seite nur für Nicht-Let\'s Encrypt-Zertifikate gelten. Denken Sie daran, Let\'s Encrypt auf der Hauptregisterkarte zu deaktivieren, wenn Sie zu einem anderen Zertifikat wechseln möchten.';
+$wb['disable_symlinknotowner_txt'] = 'Deaktiviere Symlinks-Restriktion des Webspace';
+$wb['tooltip_disable_symlinknotowner_txt'] = 'WARNUNG: Diese Funktion deaktiviert die Restriktion SymLinksIfOwnerMatch (Apache) und disable_symlinks if_not_owner (Nginx).';