remove $username when calling $data->isSuperUser about current connection role

10 files changed, 10 insertions, 16 deletions

diff --git a/all_db.php b/all_db.php
index d074714a..e25821d0 100644
--- a/all_db.php
+++ b/all_db.php
@@ -30,9 +30,7 @@
 			echo "<input name=\"newname\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
 				htmlspecialchars($_REQUEST['alterdatabase']), "\" /></td></tr>\n";
 
-			$server_info = $misc->getServerInfo();
-
-			if ($data->hasAlterDatabaseOwner() && $data->isSuperUser($server_info['username'])) {
+			if ($data->hasAlterDatabaseOwner() && $data->isSuperUser()) {
 				// Fetch all users
 
 				$rs = $data->getDatabaseOwner($_REQUEST['alterdatabase']);
diff --git a/classes/Misc.php b/classes/Misc.php
index fcfa6ec6..6a15c0dd 100644
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -529,8 +529,7 @@
 
 				case 'server':
 				case 'report':
-					$server_info = $this->getServerInfo();
-					$hide_users = !$data->isSuperUser($server_info['username']);
+					$hide_users = !$data->isSuperUser();
 					$tmp = array (
 						'databases' => array (
 							'title' => $lang['strdatabases'],
diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 588a2cc3..456b1268 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -454,7 +454,7 @@ class Postgres extends ADODB_base {
 
 		$server_info = $misc->getServerInfo();
 
-		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser()) {
 			$username = $server_info['username'];
 			$this->clean($username);
 			$clause = " AND pr.rolname='{$username}'";
diff --git a/classes/database/Postgres74.php b/classes/database/Postgres74.php
index c4f2c28c..66502860 100644
--- a/classes/database/Postgres74.php
+++ b/classes/database/Postgres74.php
@@ -73,7 +73,7 @@ class Postgres74 extends Postgres80 {
 
 		$server_info = $misc->getServerInfo();
 
-		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser()) {
 			$username = $server_info['username'];
 			$this->clean($username);
 			$clause = " AND pu.usename='{$username}'";
diff --git a/classes/database/Postgres80.php b/classes/database/Postgres80.php
index c8eb5d31..ce15f976 100644
--- a/classes/database/Postgres80.php
+++ b/classes/database/Postgres80.php
@@ -72,7 +72,7 @@ class Postgres80 extends Postgres81 {
 
 		$server_info = $misc->getServerInfo();
 
-		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser()) {
 			$username = $server_info['username'];
 			$this->clean($username);
 			$clause = " AND pu.usename='{$username}'";
diff --git a/classes/database/Postgres81.php b/classes/database/Postgres81.php
index 0e964615..3fa6eeb2 100644
--- a/classes/database/Postgres81.php
+++ b/classes/database/Postgres81.php
@@ -67,7 +67,7 @@ class Postgres81 extends Postgres82 {
 		
 		$server_info = $misc->getServerInfo();
 		
-		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser()) {
 			$username = $server_info['username'];
 			$this->clean($username);
 			$clause = " AND pr.rolname='{$username}'";
diff --git a/classes/database/Postgres83.php b/classes/database/Postgres83.php
index d66ee539..62544fa6 100644
--- a/classes/database/Postgres83.php
+++ b/classes/database/Postgres83.php
@@ -69,7 +69,7 @@ class Postgres83 extends Postgres84 {
 
 		$server_info = $misc->getServerInfo();
 
-		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser($server_info['username'])) {
+		if (isset($conf['owned_only']) && $conf['owned_only'] && !$this->isSuperUser()) {
 			$username = $server_info['username'];
 			$this->clean($username);
 			$clause = " AND pr.rolname='{$username}'";
diff --git a/sequences.php b/sequences.php
index d01127b1..21ea289a 100644
--- a/sequences.php
+++ b/sequences.php
@@ -475,8 +475,7 @@
 			echo "<input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
 				htmlspecialchars($_POST['name']), "\" /></td></tr>\n";
 
-			$server_info = $misc->getServerInfo();
-			if ($data->isSuperUser($server_info['username'])) {
+			if ($data->isSuperUser()) {
 				// Fetch all users
 				$users = $data->getUsers();
 
diff --git a/tblproperties.php b/tblproperties.php
index 2b98efc8..f65e284b 100644
--- a/tblproperties.php
+++ b/tblproperties.php
@@ -78,8 +78,7 @@
 			echo "<input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
 				htmlspecialchars($_POST['name'], ENT_QUOTES), "\" /></td></tr>\n";
 
-			$server_info = $misc->getServerInfo();
-			if ($data->isSuperUser($server_info['username'])) {
+			if ($data->isSuperUser()) {
 				echo "<tr><th class=\"data left required\">{$lang['strowner']}</th>\n";
 				echo "<td class=\"data1\"><select name=\"owner\">";
 				while (!$users->EOF) {
diff --git a/viewproperties.php b/viewproperties.php
index c52110c7..1ae0b644 100755
--- a/viewproperties.php
+++ b/viewproperties.php
@@ -258,8 +258,7 @@
 				echo "<input name=\"name\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" value=\"",
 					htmlspecialchars($_POST['name']), "\" /></td></tr>\n";
 
-				$server_info = $misc->getServerInfo();
-				if ($data->isSuperUser($server_info['username'])) {
+				if ($data->isSuperUser()) {
 
 					// Fetch all users
 					$users = $data->getUsers();