Skip to content

Commit b418037

Browse files
author
Marius Cramer
committed
- ported some patches
1 parent a563d59 commit b418037

37 files changed

+149
-39
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mbox={EMAIL}.
2020
refresh=7200
2121
retry=540
2222
expire=604800
23-
minimum=86400
23+
minimum=3600
2424
ttl=3600
2525
2626
[DNS_RECORDS]
@@ -134,3 +134,9 @@ CREATE TABLE `xmpp_user` (
134134
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
135135

136136
-- --------------------------------------------------------
137+
138+
UPDATE `dbispconfig`.`sys_ini` SET `default_logo` = 'data:image/png;base64,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' WHERE `sys_ini`.`sysini_id` = 1;
139+
140+
ALTER TABLE `directive_snippets` ADD `required_php_snippets` VARCHAR(255) NOT NULL DEFAULT '' AFTER `customer_viewable`;
141+
ALTER TABLE `dns_rr` CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';
142+
ALTER TABLE `dns_soa` CHANGE `minimum` `minimum` INT(11) UNSIGNED NOT NULL DEFAULT '3600', CHANGE `ttl` `ttl` INT(11) UNSIGNED NOT NULL DEFAULT '3600';

‎install/sql/ispconfig3.sql‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ CREATE TABLE IF NOT EXISTS `directive_snippets` (
442442
`type` varchar(255) DEFAULT NULL,
443443
`snippet` mediumtext,
444444
`customer_viewable` ENUM('n','y') NOT NULL DEFAULT 'n',
445+
`required_php_snippets` varchar(255) NOT NULL DEFAULT '',
445446
`active` enum('n','y') NOT NULL DEFAULT 'y',
446447
PRIMARY KEY (`directive_snippets_id`)
447448
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
@@ -465,7 +466,7 @@ CREATE TABLE `dns_rr` (
465466
`type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
466467
`data` TEXT NOT NULL DEFAULT '',
467468
`aux` int(11) unsigned NOT NULL default '0',
468-
`ttl` int(11) unsigned NOT NULL default '86400',
469+
`ttl` int(11) unsigned NOT NULL default '3600',
469470
`active` enum('N','Y') NOT NULL default 'Y',
470471
`stamp` timestamp NOT NULL default CURRENT_TIMESTAMP,
471472
`serial` int(10) unsigned default NULL,
@@ -517,8 +518,8 @@ CREATE TABLE `dns_soa` (
517518
`refresh` int(11) unsigned NOT NULL default '28800',
518519
`retry` int(11) unsigned NOT NULL default '7200',
519520
`expire` int(11) unsigned NOT NULL default '604800',
520-
`minimum` int(11) unsigned NOT NULL default '86400',
521-
`ttl` int(11) unsigned NOT NULL default '86400',
521+
`minimum` int(11) unsigned NOT NULL default '3600',
522+
`ttl` int(11) unsigned NOT NULL default '3600',
522523
`active` enum('N','Y') NOT NULL DEFAULT 'N',
523524
`xfer` varchar(255) NOT NULL DEFAULT '',
524525
`also_notify` varchar(255) default NULL,
@@ -2316,7 +2317,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`, `eu`)
23162317
-- Dumping data for table `dns_template`
23172318
--
23182319

2319-
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=86400\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
2320+
INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL,DKIM', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=7200\nretry=540\nexpire=604800\nminimum=3600\nttl=3600\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|3600\nA|www|{IP}|0|3600\nA|mail|{IP}|0|3600\nNS|{DOMAIN}.|{NS1}.|0|3600\nNS|{DOMAIN}.|{NS2}.|0|3600\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|3600\nTXT|{DOMAIN}.|v=spf1 mx a ~all|0|3600', 'y');
23202321

23212322

23222323
-- --------------------------------------------------------

‎interface/lib/classes/validate_dkim.inc.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ function check_private_key($field_name, $field_value, $validator) {
6262
*/
6363
function check_template($field_name, $field_value, $validator) {
6464
$dkim=false;
65-
foreach($field_value as $field ) { if($field == 'DKIM') $dkim=true; }
66-
if ($dkim && $field_value[0]!='DOMAIN') return $this->get_error($validator['errmsg']);
65+
if(is_array($field_value) && !empty($field_value)){
66+
foreach($field_value as $field ) { if($field == 'DKIM') $dkim=true; }
67+
if ($dkim && $field_value[0]!='DOMAIN') return $this->get_error($validator['errmsg']);
68+
}
6769
}
6870

6971

‎interface/web/admin/form/directive_snippets.tform.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,17 @@
105105
'default' => 'y',
106106
'value' => array(0 => 'n', 1 => 'y')
107107
),
108+
'required_php_snippets' => array (
109+
'datatype' => 'VARCHAR',
110+
'formtype' => 'CHECKBOXARRAY',
111+
'default' => '',
112+
'datasource' => array ( 'type' => 'SQL',
113+
'querystring' => "SELECT directive_snippets_id,name FROM directive_snippets WHERE type = 'php' AND active = 'y'ORDER BY name",
114+
'keyfield' => 'directive_snippets_id',
115+
'valuefield' => 'name'
116+
),
117+
'separator' => ',',
118+
),
108119
//#################################
109120
// ENDE Datatable fields
110121
//#################################

‎interface/web/admin/templates/directive_snippets_edit.htm‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
1717
<div class="form-group">
1818
<label for="snippet" class="col-sm-3 control-label">{tmpl_var name='snippet_txt'}</label>
1919
<div class="col-sm-9"><textarea class="form-control" name="snippet" id="snippet" rows='10' cols='50'>{tmpl_var name='snippet'}</textarea></div><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
20+
</div>
21+
<div class="form-group php">
22+
<label class="col-sm-3 control-label">{tmpl_var name='required_php_snippets_txt'}</label>
23+
<div class="col-sm-9">
24+
{tmpl_var name='required_php_snippets'}
25+
</div>
2026
</div>
2127
<div class="form-group">
2228
<label class="col-sm-3 control-label">{tmpl_var name='customer_viewable_txt'}</label>
@@ -48,15 +54,19 @@ <h1><tmpl_var name="list_head_txt"></h1>
4854

4955
if (jQuery('#type').val() != 'nginx' && jQuery('#type').val() != 'apache') {
5056
jQuery('#customer_viewable').closest('div.ctrlHolder:visible').hide();
51-
}else {
57+
jQuery('.php:visible').hide();
58+
} else {
5259
jQuery('#customer_viewable').closest('div.ctrlHolder:hidden').show();
60+
jQuery('.php:hidden').show();
5361
}
5462

5563
jQuery('#type').change(function(){
5664
if (jQuery(this).val() != 'nginx' && jQuery(this).val() != 'apache') {
5765
jQuery('#customer_viewable').closest('div.ctrlHolder:visible').hide();
66+
jQuery('.php:visible').hide();
5867
} else {
5968
jQuery('#customer_viewable').closest('div.ctrlHolder:hidden').show();
69+
jQuery('.php:hidden').show();
6070
}
6171
if(jQuery(this).val() == 'nginx'){
6272
jQuery('.nginx:hidden').show();

‎interface/web/dns/form/dns_a.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
'range' => '60:',
134134
'errmsg'=> 'ttl_range_error'),
135135
),
136-
'default' => '86400',
136+
'default' => '3600',
137137
'value' => '',
138138
'width' => '10',
139139
'maxlength' => '10'

‎interface/web/dns/form/dns_aaaa.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
'range' => '60:',
127127
'errmsg'=> 'ttl_range_error'),
128128
),
129-
'default' => '86400',
129+
'default' => '3600',
130130
'value' => '',
131131
'width' => '10',
132132
'maxlength' => '10'

‎interface/web/dns/form/dns_alias.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
'range' => '60:',
143143
'errmsg'=> 'ttl_range_error'),
144144
),
145-
'default' => '86400',
145+
'default' => '3600',
146146
'value' => '',
147147
'width' => '10',
148148
'maxlength' => '10'

‎interface/web/dns/form/dns_cname.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
'range' => '60:',
141141
'errmsg'=> 'ttl_range_error'),
142142
),
143-
'default' => '86400',
143+
'default' => '3600',
144144
'value' => '',
145145
'width' => '10',
146146
'maxlength' => '10'

‎interface/web/dns/form/dns_dkim.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
'range' => '60:',
121121
'errmsg'=> 'ttl_range_error'),
122122
),
123-
'default' => '86400',
123+
'default' => '3600',
124124
'value' => '',
125125
'width' => '10',
126126
'maxlength' => '10'

0 commit comments

Comments
 (0)