Fix copy/paste error

helmo · helmo · commit 1337ca1881d5 · 2020-12-22T15:02:54.000+01:00
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
@@ -154,7 +154,7 @@ function onShowEnd() {
 			$app->tpl->setVar("client_server_id", $options_mail_servers);
 			unset($options_mail_servers);
 
-			$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
+			$csrf_token = $app->auth->csrf_token_get('mail_domain_del');
 			$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 			$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 		}
diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php
@@ -86,7 +86,7 @@ function onShowEnd() {
 		}
 		$app->tpl->setVar("email_domain", $domain_select);
 
-		$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
+		$csrf_token = $app->auth->csrf_token_get('mail_forward_del');
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
@@ -135,7 +135,7 @@ function onShowEnd() {
 			$app->tpl->setVar("enable_custom_login", 0);
 		}
 
-		$csrf_token = $app->auth->csrf_token_get('mail_alias_del');
+		$csrf_token = $app->auth->csrf_token_get('mail_user_del');
 		$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);
 		$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);
 
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
@@ -122,8 +122,8 @@
                 <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>
             <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>
+                <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>
+                <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>
             </div>
 	</div>
 <script language="JavaScript" type="text/javascript">
diff --git a/interface/web/mail/templates/mail_forward_edit.htm b/interface/web/mail/templates/mail_forward_edit.htm
@@ -41,7 +41,7 @@
                 <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>
             <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>
+                <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>
             </div>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ function onShowEnd() {`
`154`	`154`	`$app->tpl->setVar("client_server_id", $options_mail_servers);`
`155`	`155`	`unset($options_mail_servers);`
`156`	`156`
`157`		`- $csrf_token = $app->auth->csrf_token_get('mail_alias_del');`
	`157`	`+ $csrf_token = $app->auth->csrf_token_get('mail_domain_del');`
`158`	`158`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`159`	`159`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ function onShowEnd() {`
`86`	`86`	`}`
`87`	`87`	`$app->tpl->setVar("email_domain", $domain_select);`
`88`	`88`
`89`		`- $csrf_token = $app->auth->csrf_token_get('mail_alias_del');`
	`89`	`+ $csrf_token = $app->auth->csrf_token_get('mail_forward_del');`
`90`	`90`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`91`	`91`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ function onShowEnd() {`
`135`	`135`	`$app->tpl->setVar("enable_custom_login", 0);`
`136`	`136`	`}`
`137`	`137`
`138`		`- $csrf_token = $app->auth->csrf_token_get('mail_alias_del');`
	`138`	`+ $csrf_token = $app->auth->csrf_token_get('mail_user_del');`
`139`	`139`	`$app->tpl->setVar('_csrf_id', $csrf_token['csrf_id']);`
`140`	`140`	`$app->tpl->setVar('_csrf_key', $csrf_token['csrf_key']);`
`141`	`141`