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

diff --git a/functions.php b/functions.php
index 32540bf56225f2b1ae31e9e61c68c7cb7e9f5dc0..16b5dac6720bb766eb4a52e0d863d0ec77acc1e2 100644 (file)
--- 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 {

diff --git a/prefs.php b/prefs.php
index 479425294afae04453141ce4185b873b0a56c6af..d2d3ca34d321137666a5064505202f1e7c6a5b5c 100644 (file)
--- a/prefs.php
+++ b/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>

diff --git a/tt-rss.php b/tt-rss.php
index 8a43f4d4bc126ac79b074da15a631937f16b15a5..2a83508db46254e0bef4ffb09b6ed010c79b204b 100644 (file)
--- 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>