commit - e662375651ff307f41601bff97e0fda0971692d9
commit + aa61fb993ca0d4bd2a80b9d7d9d109b2b5855409
blob - 2521d020a06892c7802874afc30214d593830968
blob + f1b237b6f00d04ab9be50a33d00429b3f02fba06
--- login.php
+++ login.php
@@ -46,7 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	if (empty($message)) {
 		session_start();
 		$_SESSION['sessid']['username'] = $username;
-		header("Location: main.php");
+		header("Location: list-domain.php");
 		exit;
 	}
 } 
blob - e6cdc7573cd34057fa1f747f5291dc90c8cc9eb3 (mode 644)
blob + /dev/null
--- main.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-// 
-// OpenSMTPD Admin 
-// by Mischa Peters <mischa at high5 dot nl>
-// Copyright (c) 2022 High5!
-// License Info: LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: main.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST / GET Variables:
-//
-// -none-
-//
-require_once './functions.inc.php';
-include './languages/' . check_language() . '.lang';
-
-$SESSID_USERNAME = check_session();
-
-include './templates/header.tpl';
-include './templates/menu.tpl';
-include './templates/main.tpl';
-include './templates/footer.tpl';
-?>
blob - 2996c17e4667dcace4d683308e6a65da70fbfca9 (mode 644)
blob + /dev/null
--- templates/main.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<div id="main_menu">
-<table>
-	<tr>
-		<td nowrap><a target="_top" href="list-domain.php"><?php echo $LANG['Menu_overview']; ?></a></td>
-		<td><?php echo $LANG['Main_overview']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="add-alias.php"><?php echo $LANG['Menu_create_alias']; ?></a></td>
-		<td><?php echo $LANG['Main_create_alias']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="add-mailbox.php"><?php echo $LANG['Menu_create_mailbox']; ?></a></td>
-		<td><?php echo $LANG['Main_create_mailbox']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="sendmail.php"><?php echo $LANG['Menu_sendmail']; ?></a></td>
-		<td><?php echo $LANG['Main_sendmail']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php echo $LANG['Menu_password']; ?></a></td>
-		<td><?php echo $LANG['Main_password']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="viewlog.php"><?php echo $LANG['Menu_viewlog']; ?></a></td>
-		<td><?php echo $LANG['Main_viewlog']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></td>
-		<td><?php echo $LANG['Main_logout']; ?></td>
-	</tr>
-</table>
-</div>
blob - 94f1907404338800183e200e858fdd1109a25c4e (mode 644)
blob + /dev/null
--- templates/users_main.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div id="main_menu">
-<table>
-	<tr>
-		<td>&nbsp;</td>
-		<td><?php echo $_SESSION['userid']['username']; ?></td>
-	</tr>
-	<?php if (VACATION == 'YES') { ?>
-	<tr>
-		<td nowrap><a target="_top" href="vacation.php"><?php echo $LANG['UsersMenu_vacation']; ?></a></td>
-		<td><?php echo $LANG['UsersMain_vacation']; ?></td>
-	</tr>
-	<?php } ?>
-	<tr>
-		<td nowrap><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></td>
-		<td><?php echo $LANG['UsersMain_password']; ?></td>
-	</tr>
-	<tr>
-		<td nowrap><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></td>
-		<td><?php echo $LANG['Main_logout']; ?></td>
-	</tr>
-</table>
-</div>
blob - d71d7813c82e1bcd6bebec775df0a097a6392dc1
blob + c599a2d3653065fad3cfd0ae768de4a0b5133b56
--- templates/users_menu.tpl
+++ templates/users_menu.tpl
@@ -1,9 +1,9 @@
 <div id="menu">
 <ul>
+	<li><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></li>
 	<?php if (VACATION == "YES") { ?>
 	<li><a target="_top" href="vacation.php"><?php echo $LANG['UsersMenu_vacation']; ?></a></li>
 	<?php } ?>
-	<li><a target="_top" href="password.php"><?php echo $LANG['UsersMenu_password']; ?></a></li>
 	<li><a target="_top" href="logout.php"><?php echo $LANG['Menu_logout']; ?></a></li>
 </ul>
 </div>
blob - f1fe900d55d8b995fe159a86d4ca555c88e941f6
blob + d940d52b99dd9fee2721f4781e54cfed403303ef
--- users/login.php
+++ users/login.php
@@ -45,7 +45,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
 	if (empty($message)) {
 		session_start();
 		$_SESSION['userid']['username'] = $username;
-		header("Location: main.php");
+		header("Location: password.php");
 		exit;
 	}
 } 
blob - e7bc2eca9e5559676c5ce5dab9c9497dfa71f70d (mode 644)
blob + /dev/null
--- users/main.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// 
-// OpenSMTPD Admin 
-// by Mischa Peters <mischa at high5 dot nl>
-// Copyright (c) 2022 High5!
-// License Info: LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: main.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST / GET Variables:
-//
-// -none-
-//
-require_once '../functions.inc.php';
-
-include '../languages/' . check_language() . '.lang';
-
-$SESSID_USERNAME = check_session('userid');
-
-include '../templates/header.tpl';
-include '../templates/users_menu.tpl';
-include '../templates/users_main.tpl';
-include '../templates/footer.tpl';
-?>