diff options
| -rw-r--r-- | functions.php | 8 | ||||
| -rw-r--r-- | prefs.php | 12 | ||||
| -rw-r--r-- | tt-rss.php | 10 |
3 files changed, 3 insertions, 27 deletions
diff --git a/functions.php b/functions.php index 32540bf56..16b5dac67 100644 --- a/functions.php +++ b/functions.php @@ -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 { @@ -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> diff --git a/tt-rss.php b/tt-rss.php index 8a43f4d4b..2a83508db 100644 --- a/tt-rss.php +++ b/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> |