Add show_delete_on_forms check to the other 3 new delete buttons

helmo · helmo · commit 21bfe1731265 · 2022-01-23T16:58:22.000+01:00
diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php
@@ -92,6 +92,9 @@ function onShowEnd() {
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 
+		$global_config = $app->getconf->get_global_config();
+		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
@@ -90,6 +90,9 @@ function onShowEnd() {
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 
+		$global_config = $app->getconf->get_global_config();
+		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
@@ -139,6 +139,9 @@ function onShowEnd() {
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 
+		$global_config = $app->getconf->get_global_config();
+		$app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);
+
 		parent::onShowEnd();
 	}
 
diff --git a/interface/web/mail/templates/mail_alias_edit.htm b/interface/web/mail/templates/mail_alias_edit.htm
@@ -39,9 +39,9 @@
         <input type="hidden" name="type" value="alias">
 
         <div class="clear">
-            <tmpl_if name='id'>
+            <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
                 <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>
-	    </tmpl_if>
+            </tmpl_if></tmpl_if>
             <div class="right">
                 <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>
                 <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>
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
@@ -37,9 +37,9 @@
         <input type="hidden" name="type" value="forward">
 
         <div class="clear">
-            <tmpl_if name='id'>
+            <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
                 <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>
-	    </tmpl_if>
+            </tmpl_if></tmpl_if>
             <div class="right">
                 <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>
                 <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>
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -110,9 +110,9 @@
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
 
         <div class="clear">
-            <tmpl_if name='id'>
+            <tmpl_if name='id'><tmpl_if name='show_delete_on_forms' op="==" value="y">
                 <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>
-	    </tmpl_if>
+            </tmpl_if></tmpl_if>
             <div class="right">
                 <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>
                 <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>

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ function onShowEnd() {`
`92`	`92`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`93`	`93`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`94`	`94`
	`95`	`+ $global_config = $app->getconf->get_global_config();`
	`96`	`+ $app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);`
	`97`	`+`
`95`	`98`	`parent::onShowEnd();`
`96`	`99`	`}`
`97`	`100`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,9 @@ function onShowEnd() {`
`90`	`90`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`91`	`91`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`92`	`92`
	`93`	`+ $global_config = $app->getconf->get_global_config();`
	`94`	`+ $app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);`
	`95`	`+`
`93`	`96`	`parent::onShowEnd();`
`94`	`97`	`}`
`95`	`98`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ function onShowEnd() {`
`139`	`139`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`140`	`140`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`141`	`141`
	`142`	`+ $global_config = $app->getconf->get_global_config();`
	`143`	`+ $app->tpl->setVar('show_delete_on_forms', $global_config['misc']['show_delete_on_forms']);`
	`144`	`+`
`142`	`145`	`parent::onShowEnd();`
`143`	`146`	`}`
`144`	`147`