update prefs.php logout prompt

diff --git a/prefs.php b/prefs.php
index ac874a8e4e52819db7cb57b8da1105c6eb729f34..85a01663ceeccd3132e54d413df538c0e89586dc 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -66,7 +66,19 @@
                        </td>
                </tr><tr><td class="welcomePrompt">
                        <? if (!SINGLE_USER_MODE) { ?>
-                       Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td>
+                       <? 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>

diff --git a/tt-rss.php b/tt-rss.php
index 9e04bc677d2684cb33bed5e289a6c1bea83adcf0..e88dd19d0c3384197a2c0bf109631b0f2e19d388 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -80,14 +80,15 @@
                        <? if (!SINGLE_USER_MODE) { ?>
                        <? if (USE_HTTP_AUTH) { ?>
                                <table align="right"><tr>
-                               <td class="httpWelcomePrompt">Hello, <b><?= $_SESSION["name"] ?></b></td>
+                               <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>)
+                               Hello, <b><?= $_SESSION["name"] ?></b>
+                               (<a href="logout.php">Logout</a>)
                        <? } ?>
                        </td>                   
                        <? } ?>