Fix broken HTML on login/reset pages (hestiacp#4247)

AlecRust · web-flow · commit 3dfaaf60c238 · 2024-01-17T20:01:17.000Z
diff --git a/web/login/index.php b/web/login/index.php
@@ -454,3 +454,4 @@ function authenticate_user($user, $password, $twofa = "") {
 		($_SESSION["LOGIN_STYLE"] != "old" ? "" : "_a") .
 		".php";
 }
+require_once "../templates/includes/login-footer.php";
diff --git a/web/reset/index.php b/web/reset/index.php
@@ -247,3 +247,4 @@
 		require_once "../templates/pages/login/reset_3.php";
 	}
 }
+require_once "../templates/includes/login-footer.php";
diff --git a/web/reset2fa/index.php b/web/reset2fa/index.php
@@ -64,3 +64,4 @@
 
 require_once "../templates/header.php";
 require_once "../templates/pages/login/reset2fa.php";
+require_once "../templates/includes/login-footer.php";
diff --git a/web/templates/footer.php b/web/templates/footer.php
@@ -1,6 +1,6 @@
 		</main>
 		<?php require $_SERVER["HESTIA"] . "/web/templates/includes/app-footer.php"; ?>
-	</div>
+	</div> <?php // Closes `<div class="app">` in header.php ?>
 <?php if (
 	$_SESSION["userContext"] === "admin" &&
 	$_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes" &&
diff --git a/web/templates/includes/login-footer.php b/web/templates/includes/login-footer.php
@@ -0,0 +1,4 @@
+	</div> <?php // Closes `<div class="app">` in header.php ?>
+
+</body>
+</html>
diff --git a/web/templates/pages/login/login.php b/web/templates/pages/login/login.php
@@ -19,7 +19,3 @@
 		</button>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/login_1.php b/web/templates/pages/login/login_1.php
@@ -28,7 +28,3 @@
 		</div>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/login_2.php b/web/templates/pages/login/login_2.php
@@ -29,7 +29,3 @@
 		</div>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/login_a.php b/web/templates/pages/login/login_a.php
@@ -30,7 +30,3 @@
 		</button>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/reset2fa.php b/web/templates/pages/login/reset2fa.php
@@ -42,7 +42,3 @@
 		</form>
 	<?php } ?>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/reset_1.php b/web/templates/pages/login/reset_1.php
@@ -28,7 +28,3 @@
 		</div>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/reset_2.php b/web/templates/pages/login/reset_2.php
@@ -29,7 +29,3 @@
 		</div>
 	</form>
 </div>
-
-</body>
-
-</html>
diff --git a/web/templates/pages/login/reset_3.php b/web/templates/pages/login/reset_3.php
@@ -31,7 +31,3 @@
 		</div>
 	</form>
 </div>
-
-</body>
-
-</html>

Original file line number	Diff line number	Diff line change
`@@ -454,3 +454,4 @@ function authenticate_user($user, $password, $twofa = "") {`
`454`	`454`	`($_SESSION["LOGIN_STYLE"] != "old" ? "" : "_a") .`
`455`	`455`	`".php";`
`456`	`456`	`}`
	`457`	`+require_once "../templates/includes/login-footer.php";`
Original file line number	Diff line number	Diff line change
`@@ -247,3 +247,4 @@`
`247`	`247`	`require_once "../templates/pages/login/reset_3.php";`
`248`	`248`	`}`
`249`	`249`	`}`
	`250`	`+require_once "../templates/includes/login-footer.php";`
Original file line number	Diff line number	Diff line change
`@@ -64,3 +64,4 @@`
`64`	`64`
`65`	`65`	`require_once "../templates/header.php";`
`66`	`66`	`require_once "../templates/pages/login/reset2fa.php";`
	`67`	`+require_once "../templates/includes/login-footer.php";`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +	</div> <?php // Closes `<div class="app">` in header.php ?>
++
 +</body>
 +</html>