Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/HuasoFoundries/phpPgAdmin6.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/controllers/BaseController.php')
-rw-r--r--src/controllers/BaseController.php46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
index 2bdb2cd9..3c8fda18 100644
--- a/src/controllers/BaseController.php
+++ b/src/controllers/BaseController.php
@@ -1,7 +1,7 @@
<?php
/**
- * PHPPgAdmin 6.0.0
+ * PHPPgAdmin 6.1.3
*/
namespace PHPPgAdmin\Controller;
@@ -66,8 +66,6 @@ class BaseController
/**
* @var \PHPPgAdmin\ContainerUtils
*/
- * @var \PHPPgAdmin\ContainerUtils
- */
protected $container;
protected $script;
@@ -148,28 +146,9 @@ class BaseController
if (true === $this->no_db_connection) {
$this->misc->setNoDBConnection(true);
}
-$this->renderInitialPageIfNotLogged();
-
+ $this->renderInitialPageIfNotLogged();
}
-private function renderInitialPageIfNotLogged() {
- if (false === $this->misc->getNoDBConnection()) {
- if (null === $this->misc->getServerId()) {
- $servers_controller = new \PHPPgAdmin\Controller\ServersController($this->container);
-
- $servers_controller->render();
- } else {
- $_server_info = $this->misc->getServerInfo();
- // Redirect to the login form if not logged in
- if (!isset($_server_info['username'])) {
- $msg = \sprintf($this->lang['strlogoutmsg'], $_server_info['desc']);
-
- $servers_controller = new \PHPPgAdmin\Controller\ServersController($container);
- $servers_controller->render();
- }
- }
- }
-}
/**
* Default method to render the controller according to the action parameter. It should return with a PSR
* responseObject but it prints texts whatsoeever.
@@ -499,6 +478,27 @@ private function renderInitialPageIfNotLogged() {
return $html;
}
+ private function renderInitialPageIfNotLogged(): void
+ {
+ if (false === $this->misc->getNoDBConnection()) {
+ if (null === $this->misc->getServerId()) {
+ $servers_controller = new \PHPPgAdmin\Controller\ServersController($this->container);
+
+ $servers_controller->render();
+ } else {
+ $_server_info = $this->misc->getServerInfo();
+ // Redirect to the login form if not logged in
+ if (!isset($_server_info['username'])) {
+ $msg = \sprintf($this->lang['strlogoutmsg'], $_server_info['desc']);
+
+ $servers_controller = new \PHPPgAdmin\Controller\ServersController($container);
+
+ $servers_controller->render();
+ }
+ }
+ }
+ }
+
private function _getTableController()
{
if (null === $this->_table_controller) {