Skip to content

Commit a7cb439

Browse files
committed
Extract method that sets the server global variable
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent 22f1038 commit a7cb439

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

libraries/classes/Common.php

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ final class Common
8181
*/
8282
public static function run(bool $isSetupPage = false): void
8383
{
84-
$GLOBALS['server'] = $GLOBALS['server'] ?? null;
8584
$GLOBALS['lang'] = $GLOBALS['lang'] ?? null;
8685
$GLOBALS['isConfigLoading'] = $GLOBALS['isConfigLoading'] ?? null;
8786
$GLOBALS['auth_plugin'] = $GLOBALS['auth_plugin'] ?? null;
@@ -160,20 +159,7 @@ public static function run(bool $isSetupPage = false): void
160159

161160
self::checkServerConfiguration();
162161
self::checkRequest();
163-
164-
/* setup servers LABEL_setup_servers */
165-
166-
$config->checkServers();
167-
168-
/**
169-
* current server
170-
*
171-
* @global integer $server
172-
*/
173-
$GLOBALS['server'] = $config->selectServer();
174-
$GLOBALS['urlParams']['server'] = $GLOBALS['server'];
175-
$GLOBALS['containerBuilder']->setParameter('server', $GLOBALS['server']);
176-
$GLOBALS['containerBuilder']->setParameter('url_params', $GLOBALS['urlParams']);
162+
self::setCurrentServerGlobal($config);
177163

178164
$GLOBALS['cfg'] = $config->settings;
179165

@@ -657,4 +643,14 @@ private static function setSQLQueryGlobalFromRequest(ServerRequest $request): vo
657643
$GLOBALS['sql_query'] = $sqlQuery;
658644
$GLOBALS['containerBuilder']->setParameter('sql_query', $sqlQuery);
659645
}
646+
647+
private static function setCurrentServerGlobal(Config $config): void
648+
{
649+
$config->checkServers();
650+
$server = $config->selectServer();
651+
$GLOBALS['server'] = $server;
652+
$GLOBALS['urlParams']['server'] = $server;
653+
$GLOBALS['containerBuilder']->setParameter('server', $server);
654+
$GLOBALS['containerBuilder']->setParameter('url_params', $GLOBALS['urlParams']);
655+
}
660656
}

0 commit comments

Comments
 (0)