Merge branch '6035-password-reset-to-login' into 'develop'

Marius Burkard · Marius Burkard · commit 37f2f846428b · 2021-01-29T11:33:55.000+01:00
Use password form after resetting password

Closes #6035

See merge request ispconfig/ispconfig3!1395
diff --git a/interface/web/login/password_reset.php b/interface/web/login/password_reset.php
@@ -153,6 +153,7 @@
 
 			if($send_result !== false) {
 				$app->tpl->setVar("msg", $wb['pw_reset']);
+				$app->tpl->setInclude('content_tpl', 'templates/index.htm');
 			} else {
 				$app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']);
 			}
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
@@ -1,3 +1,6 @@
+					<tmpl_if name="msg">
+					<div class="alert alert-success" role="alert"><tmpl_var name="msg"></div>
+					</tmpl_if>
 					<tmpl_if name="error">
 					<div class="alert alert-danger" role="alert"><tmpl_var name="error"></div>
 					</tmpl_if>

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@`
`153`	`153`
`154`	`154`	`if($send_result !== false) {`
`155`	`155`	`$app->tpl->setVar("msg", $wb['pw_reset']);`
	`156`	`+ $app->tpl->setInclude('content_tpl', 'templates/index.htm');`
`156`	`157`	`} else {`
`157`	`158`	`$app->tpl->setVar("error", $wb['pw_reset_error_smtp_connection']);`
`158`	`159`	`}`