more http auth related work, logout still doesn't work

functions.php

@@ -678,14 +678,10 @@
 					exit;
 				}
 			} else {
-				$force_logout = $_POST["ForceLogout"];
-	
-				if (!http_authenticate_user($link, $force_logout == "yes")) {
-					if (!http_authenticate_user($link, true)) {
+				if (!http_authenticate_user($link, false)) {
 					exit;
 				}
 			}
-			}
 		} else {
 			$_SESSION["uid"] = 1;
 			$_SESSION["name"] = "admin";

prefs.php

@@ -51,20 +51,10 @@
 			</td>
 		</tr><tr><td class="welcomePrompt">
 			<? if (!SINGLE_USER_MODE) { ?>
-			<? if (USE_HTTP_AUTH) { ?>
-				<table align="right"><tr>
-				<td class="httpWelcomePrompt">Hello, <b> <?= $_SESSION["name"] ?></b></td>
-				<td><form action="tt-rss.php" method="POST">
-					<input type="hidden" name="ForceLogout" value="yes">
-					<input type="submit" class="button" value="Logout">
-				</form>
-				</td></tr></table>
-			<? } else { ?>
 				Hello, <b><?= $_SESSION["name"] ?></b>
 				(<a href="logout.php">Logout</a>)
 			<? } ?>
 			</td>
-			<? } ?>
 		</tr></table>
 	</td>
 </tr>

tt-rss.php

@@ -64,20 +64,10 @@
 
 		</tr><tr><td class="welcomePrompt">
 			<? if (!SINGLE_USER_MODE) { ?>
-			<? if (USE_HTTP_AUTH) { ?>
-				<table align="right"><tr>
-				<td class="httpWelcomePrompt">Hello, <b> <?= $_SESSION["name"] ?></b></td>
-				<td><form action="tt-rss.php" method="POST">
-					<input type="hidden" name="ForceLogout" value="yes">
-					<input type="submit" class="button" value="Logout">
-				</form>
-				</td></tr></table>
-			<? } else { ?>
 				Hello, <b><?= $_SESSION["name"] ?></b>
 				(<a href="logout.php">Logout</a>)
 			<? } ?>
 			</td>			
-			<? } ?>
 		</tr></table>
 	</td>
 </tr>