hide several user-related prompts when using remote auth + auto_login (closes #447)

diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php
index beaca2a9a8feefd5215aebf68eae693f31b65dc1..6bc428b04566157f8aed1a870b148f38163a624d 100644 (file)
--- a/classes/pref_prefs.php
+++ b/classes/pref_prefs.php
@@ -197,7 +197,8 @@ class Pref_Prefs extends Protected_Handler {
                print "<tr><td width=\"40%\">".__('E-mail')."</td>";
                print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"email\" required=\"1\" value=\"$email\"></td></tr>";
 
-               if (!SINGLE_USER_MODE) {
+               if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) {
+
                        $access_level = db_fetch_result($result, 0, "access_level");
                        print "<tr><td width=\"40%\">".__('Access level')."</td>";
                        print "<td>" . $access_level_names[$access_level] . "</td></tr>";
@@ -213,7 +214,7 @@ class Pref_Prefs extends Protected_Handler {
 
                print "</form>";
 
-               if (!SINGLE_USER_MODE) {
+               if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) {
 
                        $result = db_query($this->link, "SELECT id FROM ttrss_users
                                WHERE id = ".$_SESSION["uid"]." AND pwd_hash

diff --git a/index.php b/index.php
index c809c183e0139ea4afc6ac0a9011fcd462f0475c..80e3ebf9ee3d25b93448e9234b81692985083d61 100644 (file)
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@
 </div>
 
 <div id="header">
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { ?>
                        <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
        <?php } ?>
        <a href="prefs.php"><?php echo __('Preferences') ?></a>
@@ -103,7 +103,7 @@
                                <?php echo __('Comments?') ?></a>
        <?php } ?>
 
-       <?php if (!SINGLE_USER_MODE) { ?>
+       <?php if (!SINGLE_USER_MODE && !(ALLOW_REMOTE_USER_AUTH && AUTO_LOGIN)) { ?>
                        | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
        <?php } ?>