From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sun, 7 Jan 2018 06:01:24 +0000 (+0000)
Subject: www/dbq/dbq.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=c879d1282b344f89f3ce9559a15af3ceb6484bb5;p=nb.git

www/dbq/dbq.php
---

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 8b06f3d2..4bb693e3 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -283,7 +283,7 @@ class DbQ extends nb {
 
 			if ($this->http_user()) {
 				$bottom[] = '<a href="/logout"'
- 				 	.' style="background:url(\'/ldap/jpegPhoto.jpg?w=20\') right no-repeat;padding-right:22px"'
+ 				 	.($this->http_user() ? ' style="background:url(\'/ldap/jpegPhoto.jpg?w=20\') right no-repeat;padding-right:22px"' : '')
 					.'>Logout: '
 					.$this->http_user()
 					.' (can: '.$this->perm2h().')'
@@ -846,7 +846,7 @@ EOF;
 		];
 
 		$user = '';
-		if (true or $user = $this->logged()) {
+		if (true or $user = $this->http_user()) {
 			if ($user) $rows[] = [ 'name' => 'dbq.user.name', 'value' => $user ];
 			$rows[] = [ 'name' => 'dbq.user.perm', 'value' => $this->perm2h() ];
 		}
@@ -986,12 +986,6 @@ EOF;
 
 	}
 
-	public function logged() {
-		if (!empty($_SERVER['PHP_AUTH_USER'])) return $_SERVER['PHP_AUTH_USER'];
-		if (!empty($_SERVER['REMOTE_USER'])) return $_SERVER['REMOTE_USER'];
-		return '';
-	}
-
 	public function logout() {
 
 		if (0) {