Skip to content

Commit d54df4b

Browse files
florian030florian030
committed
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
2 parents c704e8c + 382e663 commit d54df4b

File tree

146 files changed

+1900
-309
lines changed

Some content is hidden

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

146 files changed

+1900
-309
lines changed

‎interface/lib/classes/remote.d/dns.inc.php‎

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,13 @@ public function dns_slave_get($session_id, $primary_id) {
213213

214214

215215
//* Add a slave zone
216-
public function dns_slave_add($session_id, $client_id, $params) {
216+
public function dns_slave_add($session_id, $client_id, $params) {
217217
if(!$this->checkPerm($session_id, 'dns_zone_add')) {
218218
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
219219
return false;
220220
}
221221
return $this->insertQuery('../dns/form/dns_slave.tform.php', $client_id, $params);
222-
}
222+
}
223223

224224
//* Update a slave zone
225225
public function dns_slave_update($session_id, $client_id, $primary_id, $params) {
@@ -231,14 +231,14 @@ public function dns_slave_update($session_id, $client_id, $primary_id, $params)
231231
return $affected_rows;
232232
}
233233

234-
//* Delete a slave zone
235-
public function dns_slave_delete($session_id, $primary_id) {
234+
//* Delete a slave zone
235+
public function dns_slave_delete($session_id, $primary_id) {
236236
if(!$this->checkPerm($session_id, 'dns_zone_delete')) {
237237
throw new SoapFault('permission_denied', 'You do not have the permissions to access this function.');
238238
return false;
239239
}
240240
return $this->deleteQuery('../dns/form/dns_slave.tform.php', $primary_id);
241-
}
241+
}
242242

243243
//* Get record id by origin
244244
public function dns_zone_get_id($session_id, $origin) {
@@ -428,6 +428,28 @@ public function dns_alias_delete($session_id, $primary_id, $update_serial=false)
428428

429429
// ----------------------------------------------------------------------------------------------------------------
430430

431+
//* Get record details
432+
public function dns_caa_get($session_id, $primary_id) {
433+
return $this->dns_rr_get($session_id, $primary_id, 'CAA');
434+
}
435+
436+
//* Add a record
437+
public function dns_caa_add($session_id, $client_id, $params, $update_serial=false) {
438+
return $this->dns_rr_add($session_id, $client_id, $params, $update_serial, 'CAA');
439+
}
440+
441+
//* Update a record
442+
public function dns_caa_update($session_id, $client_id, $primary_id, $params, $update_serial=false) {
443+
return $this->dns_rr_update($session_id, $client_id, $primary_id, $params, $update_serial, 'CAA');
444+
}
445+
446+
//* Delete a record
447+
public function dns_caa_delete($session_id, $primary_id, $update_serial=false) {
448+
return $this->dns_rr_delete($session_id, $primary_id, $update_serial, 'CAA');
449+
}
450+
451+
// ----------------------------------------------------------------------------------------------------------------
452+
431453
//* Get record details
432454
public function dns_cname_get($session_id, $primary_id) {
433455
return $this->dns_rr_get($session_id, $primary_id, 'CNAME');
@@ -494,6 +516,28 @@ public function dns_mx_delete($session_id, $primary_id, $update_serial=false) {
494516

495517
// ----------------------------------------------------------------------------------------------------------------
496518

519+
//* Get record details
520+
public function dns_naptr_get($session_id, $primary_id) {
521+
return $this->dns_rr_get($session_id, $primary_id, 'NAPTR');
522+
}
523+
524+
//* Add a record
525+
public function dns_naptr_add($session_id, $client_id, $params, $update_serial=false) {
526+
return $this->dns_rr_add($session_id, $client_id, $params, $update_serial, 'NAPTR');
527+
}
528+
529+
//* Update a record
530+
public function dns_naptr_update($session_id, $client_id, $primary_id, $params, $update_serial=false) {
531+
return $this->dns_rr_update($session_id, $client_id, $primary_id, $params, $update_serial, 'NAPTR');
532+
}
533+
534+
//* Delete a record
535+
public function dns_naptr_delete($session_id, $primary_id, $update_serial=false) {
536+
return $this->dns_rr_delete($session_id, $primary_id, $update_serial, 'NAPTR');
537+
}
538+
539+
// ----------------------------------------------------------------------------------------------------------------
540+
497541
//* Get record details
498542
public function dns_ns_get($session_id, $primary_id) {
499543
return $this->dns_rr_get($session_id, $primary_id, 'NS');
@@ -582,6 +626,28 @@ public function dns_srv_delete($session_id, $primary_id, $update_serial=false) {
582626

583627
// ----------------------------------------------------------------------------------------------------------------
584628

629+
//* Get record details
630+
public function dns_tlsa_get($session_id, $primary_id) {
631+
return $this->dns_rr_get($session_id, $primary_id, 'TLSA');
632+
}
633+
634+
//* Add a record
635+
public function dns_tlsa_add($session_id, $client_id, $params, $update_serial=false) {
636+
return $this->dns_rr_add($session_id, $client_id, $params, $update_serial, 'TLSA');
637+
}
638+
639+
//* Update a record
640+
public function dns_tlsa_update($session_id, $client_id, $primary_id, $params, $update_serial=false) {
641+
return $this->dns_rr_update($session_id, $client_id, $primary_id, $params, $update_serial, 'TLSA');
642+
}
643+
644+
//* Delete a record
645+
public function dns_tlsa_delete($session_id, $primary_id, $update_serial=false) {
646+
return $this->dns_rr_delete($session_id, $primary_id, $update_serial, 'TLSA');
647+
}
648+
649+
// ----------------------------------------------------------------------------------------------------------------
650+
585651
//* Get record details
586652
public function dns_txt_get($session_id, $primary_id) {
587653
return $this->dns_rr_get($session_id, $primary_id, 'TXT');

‎interface/web/admin/lib/lang/ar_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $wb['DNS alias functions'] = 'DNS alias functions';
3535
$wb['DNS cname functions'] = 'DNS cname functions';
3636
$wb['DNS hinfo functions'] = 'DNS hinfo functions';
3737
$wb['DNS mx functions'] = 'DNS mx functions';
38+
$wb['DNS naptr functions'] = 'DNS naptr functions';
3839
$wb['DNS ns functions'] = 'DNS ns functions';
3940
$wb['DNS ptr functions'] = 'DNS ptr functions';
4041
$wb['DNS rp functions'] = 'DNS rp functions';

‎interface/web/admin/lib/lang/bg_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $wb['DNS alias functions'] = 'DNS alias функции';
3535
$wb['DNS cname functions'] = 'DNS cname функции';
3636
$wb['DNS hinfo functions'] = 'DNS hinfo функции';
3737
$wb['DNS mx functions'] = 'DNS mx функции';
38+
$wb['DNS naptr functions'] = 'DNS naptr функции';
3839
$wb['DNS ns functions'] = 'DNS ns функции';
3940
$wb['DNS ptr functions'] = 'DNS ptr функции';
4041
$wb['DNS rp functions'] = 'DNS rp функции';

‎interface/web/admin/lib/lang/br_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ $wb['DNS cname functions'] = 'Funções de CNAME dns';
5151
$wb['DNS hinfo functions'] = 'Funções de HINFO dns';
5252
$wb['DNS mx functions'] = 'Funções de MX dns';
5353
$wb['DNS ns functions'] = 'Funções de NS dns';
54+
$wb['DNS naptr functions'] = 'Funções de NAPTR dns';
5455
$wb['DNS ptr functions'] = 'Funções de PTR dns';
5556
$wb['DNS rp functions'] = 'Funções de RP dns';
5657
$wb['DNS srv functions'] = 'Funções de SVR dns';

‎interface/web/admin/lib/lang/ca_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ $wb['DNS alias functions'] = 'DNS alias functions';
3636
$wb['DNS cname functions'] = 'DNS cname functions';
3737
$wb['DNS hinfo functions'] = 'DNS hinfo functions';
3838
$wb['DNS mx functions'] = 'DNS mx functions';
39+
$wb['DNS naptr functions'] = 'DNS naptr functions';
3940
$wb['DNS ns functions'] = 'DNS ns functions';
4041
$wb['DNS ptr functions'] = 'DNS ptr functions';
4142
$wb['DNS rp functions'] = 'DNS rp functions';

‎interface/web/admin/lib/lang/cz_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $wb['DNS alias functions'] = 'Funkce DNS ALIAS';
3535
$wb['DNS cname functions'] = 'Funkce DNS CNAME';
3636
$wb['DNS hinfo functions'] = 'Funkce DNS HINFO';
3737
$wb['DNS mx functions'] = 'Funkce DNS MX';
38+
$wb['DNS naptr functions'] = 'Funkce DNS NAPTR';
3839
$wb['DNS ns functions'] = 'Funkce DNS NS';
3940
$wb['DNS ptr functions'] = 'Funkce DNS PTR';
4041
$wb['DNS rp functions'] = 'Funkce DNS RP';

‎interface/web/admin/lib/lang/de_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $wb['DNS alias functions'] = 'DNS Alias Funktionen';
3535
$wb['DNS cname functions'] = 'DNS cname Funktionen';
3636
$wb['DNS hinfo functions'] = 'DNS hinfo Funktionen';
3737
$wb['DNS mx functions'] = 'DNS mx Funktionen';
38+
$wb['DNS naptr functions'] = 'DNS NAPTR Funktionen';
3839
$wb['DNS ns functions'] = 'DNS ns Funktionen';
3940
$wb['DNS ptr functions'] = 'DNS ptr Funktionen';
4041
$wb['DNS rp functions'] = 'DNS rp Funktionen';

‎interface/web/admin/lib/lang/dk_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ $wb['DNS alias functions'] = 'DNS alias funktioner';
3636
$wb['DNS cname functions'] = 'DNS cname funktioner';
3737
$wb['DNS hinfo functions'] = 'DNS hinfo funktioner';
3838
$wb['DNS mx functions'] = 'DNS mx funktioner';
39+
$wb['DNS naptr functions'] = 'DNS naptr funktioner';
3940
$wb['DNS ns functions'] = 'DNS ns funktioner';
4041
$wb['DNS ptr functions'] = 'DNS ptr funktioner';
4142
$wb['DNS rp functions'] = 'DNS rp funktioner';

‎interface/web/admin/lib/lang/el_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ $wb['DNS alias functions'] = 'Ενέργειες εγγραφών alias του D
3535
$wb['DNS cname functions'] = 'Ενέργειες εγγραφών cname του DNS';
3636
$wb['DNS hinfo functions'] = 'Ενέργειες εγγραφών hinfo του DNS';
3737
$wb['DNS mx functions'] = 'Ενέργειες εγγραφών mx του DNS';
38+
$wb['DNS naptr functions'] = 'Ενέργειες εγγραφών naptr του DNS';
3839
$wb['DNS ns functions'] = 'Ενέργειες εγγραφών ns του DNS';
3940
$wb['DNS ptr functions'] = 'Ενέργειες εγγραφών ptr του DNS';
4041
$wb['DNS rp functions'] = 'Ενέργειες εγγραφών rp του DNS';

‎interface/web/admin/lib/lang/en_remote_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ $wb['DNS alias functions'] = 'DNS alias functions';
3636
$wb['DNS cname functions'] = 'DNS cname functions';
3737
$wb['DNS hinfo functions'] = 'DNS hinfo functions';
3838
$wb['DNS mx functions'] = 'DNS mx functions';
39+
$wb['DNS naptr functions'] = 'DNS naptr functions';
3940
$wb['DNS ns functions'] = 'DNS ns functions';
4041
$wb['DNS ptr functions'] = 'DNS ptr functions';
4142
$wb['DNS rp functions'] = 'DNS rp functions';

0 commit comments

Comments
 (0)