Skip to content

Commit f2c2137

Browse files
author
Marius Burkard
committed
Merge branch '5481-spf-button-admin' into 'develop'
Resolve "SPF modification error with user account" Closes #5481 See merge request ispconfig/ispconfig3!1612
2 parents c7bde0c + f02fd39 commit f2c2137

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

interface/web/dns/form/dns_txt.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
)
171171
);
172172

173-
if($_SESSION["s"]["user"]["typ"] == 'admin') {
173+
if($app->auth->is_admin()) {
174174
unset($form["tabs"]['dns']['fields']['data']['validators']);
175175
$form["tabs"]['dns']['fields']['data']['validators'][0]['type'] = 'NOTEMPTY';
176176
$form["tabs"]['dns']['fields']['data']['validators'][0]['errmsg'] = 'data_error_empty';

interface/web/dns/templates/dns_spf_edit.htm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@
5353

5454
<div class="clear"><div class="right">
5555
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="dns/dns_spf_edit.php">{tmpl_var name='btn_save_txt'}</button>
56+
<tmpl_if name="is_admin">
5657
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_edit_as_txt_record_txt'}" data-load-content="dns/dns_txt_edit.php?id={tmpl_var name='id'}&zone={tmpl_var name='zone'}&edit_raw=1">{tmpl_var name='btn_edit_as_txt_record_txt'}</button>
58+
</tmpl_if>
5759
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="dns/dns_soa_edit.php?id={tmpl_var name='zone'}&next_tab=dns_records">{tmpl_var name='btn_cancel_txt'}</button>
5860
</div></div>
5961

0 commit comments

Comments
 (0)