From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 16 May 2012 07:56:21 +0000 (+0400)
Subject: hide several user-related prompts when using remote auth + auto_login (closes #447)
X-Git-Tag: 1.5.11~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=949b1a949130a78419532e899cf39a92448237c0;p=tt-rss.git

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 beaca2a9..6bc428b0 100644
--- 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 c809c183..80e3ebf9 100644
--- 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 } ?>