Merge branch 'stable-3.1' into 'stable-3.1'

fixed checkbox in dmarc template

See merge request ispconfig/ispconfig3!781

Author: Till Brehm

install/sql/incremental/upd_dev_collection.sql

@@ -2,3 +2,4 @@ ALTER TABLE `web_domain` ADD COLUMN `ssl_letsencrypt_exclude` enum('n','y') NOT
 ALTER TABLE `remote_user` ADD `remote_access` ENUM('y','n') NOT NULL DEFAULT 'y' AFTER `remote_password`;
 ALTER TABLE `remote_user` ADD `remote_ips` TEXT AFTER `remote_access`;
 ALTER TABLE `server_php` ADD `active` enum('y','n') NOT NULL DEFAULT 'y' AFTER `php_fpm_pool_dir`;
+ALTER TABLE `web_domain` CHANGE `log_retention` `log_retention` INT(11) NOT NULL DEFAULT '10';

install/sql/ispconfig3.sql

@@ -1990,7 +1990,7 @@ CREATE TABLE `web_domain` (
   `http_port` int(11) unsigned NOT NULL DEFAULT '80',
   `https_port` int(11) unsigned NOT NULL DEFAULT '443',
   `folder_directive_snippets` text,
-  `log_retention` int(11) NOT NULL DEFAULT '30',
+  `log_retention` int(11) NOT NULL DEFAULT '10',
   PRIMARY KEY  (`domain_id`),
   UNIQUE KEY `serverdomain` (  `server_id` , `ip_address`,  `domain` )
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;

interface/web/dns/templates/dns_dmarc_edit.htm

@@ -147,7 +147,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
             <div class="form-group">
                 <label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>
                 <div class="col-sm-3">
-                    {tmpl_var name='active'}
+					<input type="checkbox" value="1" id="active" name="active" {tmpl_var name='active'} </input>
                 </div>
             </div>