remove several redirect urls that are just useless overhead

13 files changed, 23 insertions, 23 deletions

diff --git a/src/classes/ContainerUtils.php b/src/classes/ContainerUtils.php
index e07cceb5..b1f03e1e 100644
--- a/src/classes/ContainerUtils.php
+++ b/src/classes/ContainerUtils.php
@@ -190,7 +190,6 @@ class ContainerUtils extends Container implements ContainerInterface
             $key = self::getBackTrace();
         }
         $container = self::getContainerInstance();
-        $container = self::getContainerInstance();
         // $this->dump(__METHOD__ . ': addMessage ' . $key . '  ' . json_encode($content));
         if ($container->flash) {
             $container->flash->addMessage($key, $content);
@@ -208,7 +207,6 @@ class ContainerUtils extends Container implements ContainerInterface
     public function getDestinationWithLastTab($subject)
     {
         $container = self::getContainerInstance();
-        $container = self::getContainerInstance();
         $_server_info = $container->misc->getServerInfo();
         $this->addFlash($subject, 'getDestinationWithLastTab');
         //$this->prtrace('$_server_info', $_server_info);
diff --git a/src/controllers/FunctionsController.php b/src/controllers/FunctionsController.php
index b4d37781..64abe050 100644
--- a/src/controllers/FunctionsController.php
+++ b/src/controllers/FunctionsController.php
@@ -118,7 +118,7 @@ class FunctionsController extends BaseController
             'function' => [
                 'title' => $this->lang['strfunction'],
                 'field' => Decorator::field('proproto'),
-                'url' => \containerInstance()->subFolder . \sprintf(
+                'url'=>containerInstance()->getDestinationWithLastTab('function'),
                     '/redirect/function?action=properties&%s&',
                     $this->misc->href
                 ),
@@ -144,8 +144,7 @@ class FunctionsController extends BaseController
                 'field' => Decorator::field('procomment'),
             ],
         ];
-
-        $actions = [
+         $actions = [
             'multiactions' => [
                 'keycols' => ['function' => 'proproto', 'function_oid' => 'prooid'],
                 'url' => 'functions',
@@ -226,7 +225,7 @@ class FunctionsController extends BaseController
                 ]
             ),
         ];
-
+ 
         return $this->printTree($funcs, $attrs, 'functions');
     }
 
diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php
index 7f954517..5d7bfe21 100644
--- a/src/controllers/LoginController.php
+++ b/src/controllers/LoginController.php
@@ -99,7 +99,7 @@ class LoginController extends BaseController
             $login_html .= $this->printMsg($msg, false);
         }
 
-        $login_html .= '<form id="login_form"    method="post" name="login_form" action="' . \containerInstance()->subFolder . '/redirect/server?server=' . \htmlspecialchars($server_id) . '">';
+        $login_html .= '<form id="login_form"    method="post" name="login_form" action="' . \containerInstance()->subFolder . '/login?server=' . \htmlspecialchars($server_id) . '">';
 
         $md5_server = \md5($server_id);
         // Pass request vars through form (is this a security risk???)
diff --git a/src/controllers/MaterializedviewsController.php b/src/controllers/MaterializedviewsController.php
index 6bf6cc7a..5930a557 100644
--- a/src/controllers/MaterializedviewsController.php
+++ b/src/controllers/MaterializedviewsController.php
@@ -125,7 +125,7 @@ class MaterializedviewsController extends BaseController
             $this->keystring => [
                 'title' => 'M ' . $this->lang['strview'],
                 'field' => Decorator::field('relname'),
-                'url' => \containerInstance()->subFolder . \sprintf(
+                'url' => \containerInstance()->getDestinationWithLastTab('matview'),
                     '/redirect/matview?%s&amp;',
                     $this->misc->href
                 ),
diff --git a/src/controllers/RolesController.php b/src/controllers/RolesController.php
index 86fe3fc5..8b3809a1 100644
--- a/src/controllers/RolesController.php
+++ b/src/controllers/RolesController.php
@@ -117,7 +117,7 @@ class RolesController extends BaseController
             'role' => [
                 'title' => $this->lang['strrole'],
                 'field' => Decorator::field('rolname'),
-                'url' => \containerInstance()->subFolder . \sprintf(
+                'url' => \containerInstance()->getDestinationWithLastTab('role'),
                     '/redirect/role?action=properties&amp;%s&amp;',
                     $this->misc->href
                 ),
diff --git a/src/controllers/ServersController.php b/src/controllers/ServersController.php
index 6faf2666..d3b5e2eb 100644
--- a/src/controllers/ServersController.php
+++ b/src/controllers/ServersController.php
@@ -107,7 +107,7 @@ class ServersController extends BaseController
             'server' => [
                 'title' => $this->lang['strserver'],
                 'field' => Decorator::field('desc'),
-                'url' => \containerInstance()->subFolder . '/redirect/server?',
+                'url' => \containerInstance()->getDestinationWithLastTab('server'),
                 'vars' => ['server' => 'sha'],
             ],
             'host' => [
diff --git a/src/controllers/TablesController.php b/src/controllers/TablesController.php
index 79f8b462..d1ef7279 100644
--- a/src/controllers/TablesController.php
+++ b/src/controllers/TablesController.php
@@ -1521,7 +1521,7 @@ class TablesController extends BaseController
             'table' => [
                 'title' => $this->lang['strtable'],
                 'field' => Decorator::field('relname'),
-                'url' => \containerInstance()->subFolder . \sprintf(
+                'url' => \containerInstance()->getDestinationWithLastTab('table'),
                     '/redirect/table?%s&amp;',
                     $this->misc->href
                 ),
diff --git a/src/controllers/TreeController.php b/src/controllers/TreeController.php
index fbe4d0c2..cca10b87 100644
--- a/src/controllers/TreeController.php
+++ b/src/controllers/TreeController.php
@@ -178,9 +178,15 @@ class TreeController extends BaseController
                     'openicon' => Decorator::get_sanitized_value($icon, $rec),
                     'tooltip' => Decorator::get_sanitized_value($attrs['toolTip'], $rec),
                     'a_attr' => ['href' => $href],
+                    //'url'=>strtolower(),
                     'children' => false,
                 ];
+
                 $url = Decorator::get_sanitized_value($attrs['branch'], $rec);
+                $urlparts=parse_url('https://dummy.domain'.$tree['a_attr']['href']);
+                $path_arr=explode('/',$urlparts['path']??'');
+                $tree['url']=containerInstance()->getDestinationWithLastTab(array_pop($path_arr));
+
 
                 
                     $url = \str_replace('/src/views/', '/',    $url);
@@ -195,7 +201,7 @@ class TreeController extends BaseController
 
                 $parent[] = $tree;
             }
-        } else {
+         } else {
             $parent = ['children' => false];
         }
 
diff --git a/src/controllers/ViewsController.php b/src/controllers/ViewsController.php
index 1e0332df..3872e19f 100644
--- a/src/controllers/ViewsController.php
+++ b/src/controllers/ViewsController.php
@@ -125,7 +125,7 @@ class ViewsController extends BaseController
             $this->keystring => [
                 'title' => $this->lang['strview'],
                 'field' => Decorator::field('relname'),
-                'url' => \containerInstance()->subFolder . \sprintf(
+                'url' => \containerInstance()->getDestinationWithLastTab('view'),
                     '/redirect/view?%s&amp;',
                     $this->misc->href
                 ),
diff --git a/src/traits/AdminTrait.php b/src/traits/AdminTrait.php
index dd9fa1f2..ea97a1f3 100644
--- a/src/traits/AdminTrait.php
+++ b/src/traits/AdminTrait.php
@@ -948,13 +948,13 @@ trait AdminTrait
             'namespace' => [
                 'title' => $this->lang['strschema'],
                 'field' => Decorator::field('nspname'),
-                'url' => \containerInstance()->subFolder . "/redirect/schema?{$this->misc->href}&amp;",
+                'url' => \containerInstance()->getDestinationWithLastTab('schema'),
                 'vars' => ['schema' => 'nspname'],
             ],
             'relname' => [
                 'title' => $this->lang['strtable'],
                 'field' => Decorator::field('relname'),
-                'url' => \containerInstance()->subFolder . "/redirect/table?{$this->misc->href}&amp;",
+                'url' => \containerInstance()->getDestinationWithLastTab('table'),
                 'vars' => ['table' => 'relname', 'schema' => 'nspname'],
             ],
             'autovacuum_enabled' => [
diff --git a/src/traits/MiscTrait.php b/src/traits/MiscTrait.php
index dc44bea1..7fcd3ee2 100644
--- a/src/traits/MiscTrait.php
+++ b/src/traits/MiscTrait.php
@@ -166,7 +166,7 @@ trait MiscTrait
         }
 
         if (containerInstance()->subFolder . '/redirect' === $vars['url'] && isset($vars['params']['subject'])) {
-            $vars['url'] = \containerInstance()->subFolder . '/redirect/' . $vars['params']['subject'];
+            $vars['url'] = \containerInstance()->getDestinationWithLastTab( $vars['params']['subject']);
             unset($vars['params']['subject']);
         }
 
diff --git a/src/traits/ServersTrait.php b/src/traits/ServersTrait.php
index 0a8e8c16..93c42c37 100644
--- a/src/traits/ServersTrait.php
+++ b/src/traits/ServersTrait.php
@@ -56,7 +56,7 @@ trait ServersTrait
                 $srvs[$server_sha]['id'] = $server_id;
                 $srvs[$server_sha]['sha'] = $server_sha;
                 $srvs[$server_sha]['action'] = Decorator::url(
-                    '/redirect/server',
+                    '/src/views/alldb',
                     [
                         'server' => Decorator::field('sha'),
                     ]
@@ -78,7 +78,6 @@ trait ServersTrait
                 }
             }
         }
-
         \uasort($srvs, static function ($a, $b) {
             return \strcmp($a['desc'], $b['desc']);
         });
diff --git a/src/xhtml/HTMLNavbarController.php b/src/xhtml/HTMLNavbarController.php
index 85114588..40f4f5d9 100644
--- a/src/xhtml/HTMLNavbarController.php
+++ b/src/xhtml/HTMLNavbarController.php
@@ -191,15 +191,13 @@ class HTMLNavbarController extends HTMLController
             $search_paths = $data->getSearchPath();
 
             foreach ($search_paths as $schema) {
-                $url = \str_replace(['&amp;', 'redirect/database'], ['&', 'redirect/schema'], $dburl . '&schema=' . $schema);
-                $destination = $this->container->getDestinationWithLastTab('database');
-                //$this->dump(['url' => $url, 'destination' => $destination]);
-                $search_path_crumbs[$schema] = [
+                 $destination = $this->container->getDestinationWithLastTab('database');
+                 $search_path_crumbs[$schema] = [
                     'title' => $lang['strschema'],
                     'text' => $schema,
                     'icon' => $this->view->icon('Schema'),
                     'iconalt' => $lang['strschema'],
-                    'url' => $url,
+                    'url' => $destination,
                 ];
             }
             $viewVars['search_paths'] = $search_path_crumbs;