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

diff --git a/all_db.php b/all_db.php
index d074714a6f31e61f8f741c21ee3342f738938189..e25821d0142af2878f2ff3cc2b226f906a9ca136 100644 (file)
--- 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 fcfa6ec605e3933593e22144065faa805b4c0e0f..6a15c0dd0d39ef0e655350aac40e87f44965dedf 100644 (file)
--- 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 588a2cc3ab5e9a6f0b6e80fe8e8044271745241a..456b12684e75eef405b5ff67cfbdb9aca1ee15c9 100755 (executable)
--- 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 c4f2c28c4e4396040d03becf938168345b9ae7ec..665028604d791f8236c029d07b7b093c48681c5c 100644 (file)
--- 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 c8eb5d315676e5f66b3d07ad324bae32525cee5e..ce15f97620752ec91d900ce195097b9ee6cc0f4c 100644 (file)
--- 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 0e964615760e08e0f41968ab7bb8a64c733240ba..3fa6eeb244d378c5818f83a075750464dcce9a1e 100644 (file)
--- 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 d66ee539531f38c024519a1104ddebdff234cecc..62544fa67be283eb0ae3380e50aa7fce09de9fc0 100644 (file)
--- 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 d01127b12e57eb02e414479efba4ef94f00de779..21ea289a42c6db4e90655e25b844cc6fff0cfb6a 100644 (file)
--- 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 2b98efc8d0c458f23539d0748761b2dce9c1bf2e..f65e284b480d073293f95415d1944771cb267892 100644 (file)
--- 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 c52110c7416cf6df022e2354ad1e989edf536161..1ae0b644a827497a0d790fb6f74e02b0aa02a38e 100755 (executable)
--- 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();