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

master
Andrew Dolgov 19 years ago
parent b8aa49bc97
commit 26c5729f9d

@ -678,12 +678,8 @@
exit; exit;
} }
} else { } else {
$force_logout = $_POST["ForceLogout"]; if (!http_authenticate_user($link, false)) {
exit;
if (!http_authenticate_user($link, $force_logout == "yes")) {
if (!http_authenticate_user($link, true)) {
exit;
}
} }
} }
} else { } else {

@ -51,20 +51,10 @@
</td> </td>
</tr><tr><td class="welcomePrompt"> </tr><tr><td class="welcomePrompt">
<? if (!SINGLE_USER_MODE) { ?> <? 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> Hello, <b><?= $_SESSION["name"] ?></b>
(<a href="logout.php">Logout</a>) (<a href="logout.php">Logout</a>)
<? } ?> <? } ?>
</td> </td>
<? } ?>
</tr></table> </tr></table>
</td> </td>
</tr> </tr>

@ -64,20 +64,10 @@
</tr><tr><td class="welcomePrompt"> </tr><tr><td class="welcomePrompt">
<? if (!SINGLE_USER_MODE) { ?> <? 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> Hello, <b><?= $_SESSION["name"] ?></b>
(<a href="logout.php">Logout</a>) (<a href="logout.php">Logout</a>)
<? } ?> <? } ?>
</td> </td>
<? } ?>
</tr></table> </tr></table>
</td> </td>
</tr> </tr>

Loading…
Cancel
Save