Skip to content

Commit 8c5ba07

Browse files
helmohelmo
committed
Add delete button to some edit forms
1 parent 91a7ecb commit 8c5ba07

File tree

8 files changed

+51
-16
lines changed

8 files changed

+51
-16
lines changed

‎interface/web/mail/mail_alias_edit.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ function onShowEnd() {
8888
}
8989
$app->tpl->setVar("email_domain", $domain_select);
9090

91+
$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
92+
$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
93+
$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
94+
9195
parent::onShowEnd();
9296
}
9397

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ function onShowEnd() {
154154
$app->tpl->setVar("client_server_id", $options_mail_servers);
155155
unset($options_mail_servers);
156156

157+
$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
158+
$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
159+
$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
157160
}
158161

159162
/*

‎interface/web/mail/mail_forward_edit.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ function onShowEnd() {
8686
}
8787
$app->tpl->setVar("email_domain", $domain_select);
8888

89+
$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
90+
$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
91+
$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
92+
8993
parent::onShowEnd();
9094
}
9195

‎interface/web/mail/mail_user_edit.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ function onShowEnd() {
135135
$app->tpl->setVar("enable_custom_login", 0);
136136
}
137137

138+
$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
139+
$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
140+
$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
141+
138142
parent::onShowEnd();
139143
}
140144

‎interface/web/mail/templates/mail_alias_edit.htm‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@
3838
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3939
<input type="hidden" name="type" value="alias">
4040

41-
<div class="clear"><div class="right">
42-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
43-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
44-
</div></div>
41+
<div class="clear">
42+
<tmpl_if name='id'>
43+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('mail/mail_alias_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
44+
</tmpl_if>
45+
<div class="right">
46+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
47+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
48+
</div>
49+
</div>

‎interface/web/mail/templates/mail_domain_edit.htm‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,15 @@
117117

118118
<input type="hidden" name="id" value="{tmpl_var name='id'}">
119119
<input type="hidden" name="type" value="local">
120-
<div class="clear"><div class="right">
121-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
122-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
123-
</div></div>
120+
<div class="clear">
121+
<tmpl_if name='id'>
122+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('mail/mail_domain_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
123+
</tmpl_if>
124+
<div class="right">
125+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
126+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
127+
</div>
128+
</div>
124129
<script language="JavaScript" type="text/javascript">
125130
$("#dkim-button").click(function() { getDKIM(); });
126131

‎interface/web/mail/templates/mail_forward_edit.htm‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@
3636
<input type="hidden" name="id" value="{tmpl_var name='id'}">
3737
<input type="hidden" name="type" value="forward">
3838

39-
<div class="clear"><div class="right">
40-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_forward_edit.php">{tmpl_var name='btn_save_txt'}</button>
41-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_forward_list.php">{tmpl_var name='btn_cancel_txt'}</button>
42-
</div></div>
39+
<div class="clear">
40+
<tmpl_if name='id'>
41+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('mail/mail_domain_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
42+
</tmpl_if>
43+
<div class="right">
44+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
45+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
46+
</div>
47+
</div>

‎interface/web/mail/templates/mail_user_mailbox_edit.htm‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@
109109

110110
<input type="hidden" name="id" value="{tmpl_var name='id'}">
111111

112-
<div class="clear"><div class="right">
113-
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
114-
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
115-
</div></div>
112+
<div class="clear">
113+
<tmpl_if name='id'>
114+
<a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('mail/mail_user_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='_csrf_id'}&_csrf_key={tmpl_var name='_csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
115+
</tmpl_if>
116+
<div class="right">
117+
<button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
118+
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
119+
</div>
120+
</div>

0 commit comments

Comments
 (0)