From 1438a9d71af28f7257707de916596cf65ae93f13 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 2 Jan 2017 17:13:54 +0100
Subject: [PATCH] Display which page will be shown when hitting Return + Logout
 always goes to the very same URL

---
 scripts/pi-hole/php/header.php    | 2 +-
 scripts/pi-hole/php/loginpage.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 30223124..b5c1b66b 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -442,7 +442,7 @@
                 // Show Logout button if $auth is set and authorization is required
                 if(strlen($pwhash) > 0) { ?>
                 <li>
-                    <a href="settings.php?logout">
+                    <a href="?logout">
                         <i class="fa fa-user-times"></i> <span>Logout</span>
                     </a>
                 </li>
diff --git a/scripts/pi-hole/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
index 34235db0..beba3c87 100644
--- a/scripts/pi-hole/php/loginpage.php
+++ b/scripts/pi-hole/php/loginpage.php
@@ -21,7 +21,7 @@
         <div class="row">
           <div class="col-xs-8">
           <ul>
-            <li><tt>Return</tt> &rarr; Log in and go to Main page</li>
+            <li><tt>Return</tt> &rarr; Log in and go to requested page (<?php echo $scriptname; ?>)</li>
             <li><tt>Ctrl+Return</tt> &rarr; Log in and go to Settings page</li>
           </ul>
           </div>