diff options
| author | Andrew Dolgov <[email protected]> | 2012-05-16 11:56:21 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-05-16 11:56:21 +0400 |
| commit | 949b1a949130a78419532e899cf39a92448237c0 (patch) | |
| tree | 95461fcb3dc50778bdb1096a1920e940a8a5525d | |
| parent | 35b9844be1b05e1d75646f53dc080d106ab5770e (diff) | |
hide several user-related prompts when using remote auth + auto_login (closes #447)
| -rw-r--r-- | classes/pref_prefs.php | 5 | ||||
| -rw-r--r-- | index.php | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/classes/pref_prefs.php b/classes/pref_prefs.php index beaca2a9a..6bc428b04 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 @@ -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 } ?> |