Skip to content

Commit 8e5c13b

Browse files
author
Till Brehm
committed
Merge branch 'develop' into '6452-uncaught-typeerror-array_merge-argument-1-must-be-of-type-array-bool-given-in'
# Conflicts: # server/lib/classes/file.inc.php
2 parents e3f14f7 + 35d9790 commit 8e5c13b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+92
-21
lines changed

‎install/lib/install.lib.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -547,16 +547,15 @@ function remove_blank_lines($input, $file = 1){
547547
$content = $input;
548548
}
549549
$lines = explode("\n", $content);
550+
$new_lines = array();
550551
if(!empty($lines)){
551552
foreach($lines as $line){
552553
if(trim($line) != '') $new_lines[] = $line;
553554
}
554555
}
555-
if(is_array($new_lines)){
556-
$content = implode("\n", $new_lines);
557-
} else {
558-
$content = '';
559-
}
556+
557+
$content = implode("\n", $new_lines);
558+
560559
if($file){
561560
wf($input, $content);
562561
}else{

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,11 +3145,11 @@ public function make_ispconfig_ssl_cert() {
31453145
$out = null;
31463146
$ret = null;
31473147
if($conf['nginx']['installed'] == true || $conf['apache']['installed'] == true) {
3148-
exec("$acme --issue --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
3148+
exec("$acme --issue --keylength 4096 --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
31493149
}
31503150
// Else, it is not webserver, so we use standalone
31513151
else {
3152-
exec("$acme --issue --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
3152+
exec("$acme --issue --keylength 4096 --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
31533153
}
31543154

31553155
if($ret == 0 || ($ret == 2 && file_exists($check_acme_file))) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function getQueryString($no_limit = false) {
226226
}
227227

228228
$sql_where = $app->listform->getSearchSQL($sql_where);
229-
if(isset($app->listform->listDef['join_sql'])) $sql_where .= ' AND '.$app->listform->listDef['join_sql'];
229+
if(isset($app->listform->listDef['join_sql']) && $app->listform->listDef['join_sql'] != '') $sql_where .= ' AND '.$app->listform->listDef['join_sql'];
230230
$app->tpl->setVar($app->listform->searchValues);
231231

232232
$order_by_sql = $this->SQLOrderBy;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,12 @@ function getHTML($record, $tab, $action = 'NEW') {
560560
foreach($vals as $tvl) {
561561
if(trim($tvl) == trim($k)) $checked = ' CHECKED';
562562
}
563+
$datacheckfields = '';
564+
if (isset($field['data-check-fields'])) {
565+
$datacheckfields = " data-check-fields=\"{$field['data-check-fields']}\"";
566+
}
563567
// $out .= "<label for=\"".$key."[]\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key."[]\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>\r\n";
564-
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>";
568+
$out .= "<label for=\"".$key.$elementNo."\" class=\"inlineLabel\"$datacheckfields><input name=\"".$key."[]\" id=\"".$key.$elementNo."\" value=\"$k\" type=\"checkbox\" $checked /> $v</label>";
565569
if (isset($field['render_inline']) && $field['render_inline'] == 'n') {
566570
$out .= "<br/>\r\n";
567571
}

‎interface/web/admin/server_config_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ function onShowEdit() {
125125
function onShowEnd() {
126126
global $app;
127127

128-
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ? AND ((SELECT COUNT(*) FROM server) > 1)", $this->id);
128+
$tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ? AND ((SELECT COUNT(*) FROM server) >= 1)", $this->id);
129129
$app->tpl->setVar('server_name', $app->functions->htmlentities($tmp['server_name']));
130130
unset($tmp);
131131

‎interface/web/dns/dns_import.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,11 @@ function fqdn_name( $owner, $origin ) {
622622
$error[] = $wb['zone_file_soa_parser'];
623623
$error[] = print_r( $soa, true );
624624
}
625-
if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($soa['name']) ) {
625+
626+
$tmp_soa_name = trim($soa['name'], ".");
627+
$tmp_domain_id = $app->db->queryOneRecord('SELECT domain_id FROM domain where domain = ?', $tmp_soa_name);
628+
629+
if ($settings['use_domain_module'] == 'y' && ! $app->tools_sites->checkDomainModuleDomain($tmp_domain_id['domain_id']) ) {
626630
$valid_zone_file = false;
627631
$error[] = $wb['zone_not_allowed'];
628632
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
'separator' => ',',
303303
'default' => 'ECDSAP256SHA256',
304304
'value' => array('NSEC3RSASHA1' => '7 (NSEC3RSASHA1)','ECDSAP256SHA256' => '13 (ECDSAP256SHA256)'),
305+
'data-check-fields' => 'dnssec_wanted',
305306
'width' => '30',
306307
'maxlength' => '255'
307308
),

‎interface/web/dns/list/dns_soa.list.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,16 @@
6161
'width' => "",
6262
'value' => array('Y' => $app->lng('yes_txt'), 'N' => $app->lng('no_txt')));
6363

64+
$liste["item"][] = array( 'field' => "dnssec_initialized",
65+
'datatype' => "VARCHAR",
66+
'formtype' => "TEXT",
67+
'op' => "=",
68+
'prefix' => "",
69+
'suffix' => "",
70+
'width' => "",
71+
'value' => '',
72+
);
73+
6474

6575
$liste["item"][] = array( 'field' => "server_id",
6676
'datatype' => "VARCHAR",

‎interface/web/dns/templates/dns_soa_admin_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5757
<tbody>
5858
<tmpl_loop name="records">
5959
<tr>
60-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}</td>
60+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}<tmpl_if name="dnssec_initialized" op="==" value="Y"> <i class="fa fa-key" aria-hidden="true"></i></tmpl_if></td>
6161
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="sys_groupid"}</a></td>
6262
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
6363
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>

‎interface/web/dns/templates/dns_soa_list.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
5555
<tbody>
5656
<tmpl_loop name="records">
5757
<tr>
58-
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}</td>
58+
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records">{tmpl_var name="active"}<tmpl_if name="dnssec_initialized" op="==" value="Y"> <i class="fa fa-key" aria-hidden="true"></i></tmpl_if></td>
5959
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
6060
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='origin'}">{tmpl_var name="origin"}</a></td>
6161
<td><a href="#" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='id'}&next_tab=dns_records" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ns'}">{tmpl_var name="ns"}</a></td>

0 commit comments

Comments
 (0)