From: Andrew Dolgov <fox@bah.spb.su>
Date: Sun, 20 Nov 2005 11:27:11 +0000 (+0100)
Subject: more http auth related work, logout still doesn't work
X-Git-Tag: schema_feature_freeze_for_1.1~153
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=26c5729f9d02272ae16ca165bc320e5a1dc5115b;p=tt-rss.git

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

diff --git a/functions.php b/functions.php
index 32540bf5..16b5dac6 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 {
diff --git a/prefs.php b/prefs.php
index 47942529..d2d3ca34 100644
--- 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 8a43f4d4..2a83508d 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>