Merge branch 'develop' into 6501-php-ssh-cron

Author: ms217

.gitignore

@@ -64,3 +64,4 @@ Temporary Items
 /server/lib/config.inc.php
 /server/lib/config.inc.local.php
 /interface/lib/config.inc.local.php
+/install/existing_db.sql

install/tpl/server.ini.master

@@ -122,6 +122,7 @@ add_web_users_to_sshusers_group=y
 connect_userid_to_webid=n
 connect_userid_to_webid_start=10000
 web_folder_protection=y
+web_folder_permission=0710
 php_ini_check_minutes=1
 overtraffic_disable_web=y
 overquota_notify_threshold=90

interface/web/admin/form/server_config.tform.php

@@ -1088,6 +1088,16 @@
 			'default' => 'n',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'web_folder_permission' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => '0710',
+			'maxlength' => '4',
+			'value' => array('0710' => '0710', '0711' => '0711', '0750' => '0750', '0751' => '0751'),
+			'validators' => array(	0 => array ('type' => 'REGEX',
+										'regex' => '/^0[0-7]{3}$/',
+										'errmsg'=> 'incorrect_permissions_regex')),
+		),
 		'web_folder_protection' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/ar_server_config.lng

@@ -168,6 +168,7 @@ $wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down my
 $wb['enable_sni_txt'] = 'Enable SNI';
 $wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
 $wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
 $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
 $wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';

interface/web/admin/lib/lang/bg_server_config.lng

@@ -168,6 +168,7 @@ $wb['rescue_description_txt'] = '<b>ИНФОРМАЦИЯ:</b> Ако искат
 $wb['enable_sni_txt'] = 'Enable SNI';
 $wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
 $wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
 $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
 $wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';

interface/web/admin/lib/lang/br_server_config.lng

@@ -182,6 +182,7 @@ $wb['do_not_try_rescue_mail_txt'] = 'Desabilitar monitoramento do servidor de em
 $wb['rescue_description_txt'] = '<b>Informação:</b> Se o serviço MySQL for desligado e estiver selecionado "Desabilitar monitoramento do MySQL" aguarde entre 2 e 3 minutos sem abandonar a aba. <br>Se não aguardar o sistema de recuperação de falhas tentará reiniciar o MySQL!';
 $wb['enable_sni_txt'] = 'Habilitar SNI';
 $wb['set_folder_permissions_on_update_txt'] = 'Configurar permissões de pasta quando atualizar';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Adicionar novos usuários Web para o grupo SSH';
 $wb['connect_userid_to_webid_txt'] = 'Conectar o UID do usuário no sistema para webID';
 $wb['connect_userid_to_webid_start_txt'] = 'Conexão do ID inicial do usuário com o webID';

interface/web/admin/lib/lang/ca_server_config.lng

@@ -178,6 +178,7 @@ $wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
 $wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the \\"Disable MySQL monitor\\" checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
 $wb['enable_sni_txt'] = 'Enable SNI';
 $wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
 $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
 $wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';

interface/web/admin/lib/lang/cn_server_config.lng

@@ -189,6 +189,7 @@ $wb['do_not_try_rescue_mail_txt'] = '禁用电子邮件监视';
 $wb['rescue_description_txt'] = '如果要关闭MySQL，必须选择“禁用MySQL监视”复选框，然后等待2-3分钟。如果不等待2-3分钟，救援将尝试重新启动MySQL！';
 $wb['enable_sni_txt'] = '启用SNI';
 $wb['set_folder_permissions_on_update_txt'] = '更新时设置文件夹权限';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = '将Web用户添加到-sshusers-组中';
 $wb['connect_userid_to_webid_txt'] = '将Linux用户ID连接到Web ID';
 $wb['connect_userid_to_webid_start_txt'] = '用户ID / Web ID连接的起始ID';

interface/web/admin/lib/lang/cz_server_config.lng

@@ -154,6 +154,7 @@ $wb['rescue_description_txt'] = '<b>Informace:</b> Pokud chcete např. vypnout M
 $wb['enable_sni_txt'] = 'Aktivovat SNI (Server Name Indication)';
 $wb['do_not_try_rescue_httpd_txt'] = 'Zakázat HTTPD monitorování';
 $wb['set_folder_permissions_on_update_txt'] = 'Nastavení oprávnění složky při aktualizaci';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
 $wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
 $wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';

interface/web/admin/lib/lang/de_server_config.lng

@@ -175,6 +175,7 @@ $wb['do_not_try_rescue_mail_txt'] = 'Deaktiviere E-Mail Monitoring';
 $wb['rescue_description_txt'] = '<b>Information:</b> Falls Sie MySQL stoppen möchten, wählen Sie die Funktion \'Deaktiviere MySQL Monitoring\' und warten Sie 2 bis 3 Minuten. Wenn Sie nicht 2 bis 3 Minuten warten wird ISPConfig versuchen MySQL wieder zu starten.';
 $wb['enable_sni_txt'] = 'Aktiviere SNI';
 $wb['set_folder_permissions_on_update_txt'] = 'Verzeichnisberechtigungen beim Update setzen';
+$wb['incorrect_permissions_regex'] = 'Incorrect permissions string';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Webbenutzer zur -sshusers- hinzufügen';
 $wb['connect_userid_to_webid_txt'] = 'Linux Userid mit webid verknüpfen';
 $wb['connect_userid_to_webid_start_txt'] = 'Start ID für userid/webid Verknüpfung';