valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2012-05-16 11:56:21 +04:00
parent 35b9844be1
commit 949b1a9491
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/pref_prefs.php
View File

@ -197,7 +197,8 @@ class Pref_Prefs extends Protected_Handler {
print "<tr><td width=\"40%\">".__('E-mail')."</td>"; 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>"; 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"); $access_level = db_fetch_result($result, 0, "access_level");
print "<tr><td width=\"40%\">".__('Access level')."</td>"; print "<tr><td width=\"40%\">".__('Access level')."</td>";
print "<td>" . $access_level_names[$access_level] . "</td></tr>"; print "<td>" . $access_level_names[$access_level] . "</td></tr>";
@ -213,7 +214,7 @@ class Pref_Prefs extends Protected_Handler {
print "</form>"; 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 $result = db_query($this->link, "SELECT id FROM ttrss_users
WHERE id = ".$_SESSION["uid"]." AND pwd_hash WHERE id = ".$_SESSION["uid"]." AND pwd_hash

4
index.php
View File

@ -93,7 +93,7 @@
</div> </div>
<div id="header"> <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 echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
<?php } ?> <?php } ?>
<a href="prefs.php"><?php echo __('Preferences') ?></a> <a href="prefs.php"><?php echo __('Preferences') ?></a>
@ -103,7 +103,7 @@
<?php echo __('Comments?') ?></a> <?php echo __('Comments?') ?></a>
<?php } ?> <?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> | <a href="backend.php?op=logout"><?php echo __('Logout') ?></a>
<?php } ?> <?php } ?>