more http auth related work, logout still doesn't work
This commit is contained in:
parent
b8aa49bc97
commit
26c5729f9d
3 changed files with 3 additions and 27 deletions
|
@ -678,12 +678,8 @@
|
|||
exit;
|
||||
}
|
||||
} else {
|
||||
$force_logout = $_POST["ForceLogout"];
|
||||
|
||||
if (!http_authenticate_user($link, $force_logout == "yes")) {
|
||||
if (!http_authenticate_user($link, true)) {
|
||||
exit;
|
||||
}
|
||||
if (!http_authenticate_user($link, false)) {
|
||||
exit;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
12
prefs.php
12
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>
|
||||
<? } ?>
|
||||
</td>
|
||||
</tr></table>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
10
tt-rss.php
10
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>
|
||||
|
|
Loading…
Reference in a new issue