Setup script refactoring: moved ConfigFile, Form, FormDisplay
Config db overrides and validation info stored in config.values.php
This commit is contained in:
@@ -21,8 +21,8 @@ if (!file_exists('./libraries/common.inc.php')) {
|
||||
require_once './libraries/common.inc.php';
|
||||
require_once './libraries/config/config_functions.lib.php';
|
||||
require_once './libraries/config/messages.inc.php';
|
||||
require_once './libraries/config/ConfigFile.class.php';
|
||||
require_once './libraries/url_generating.lib.php';
|
||||
require_once './setup/lib/ConfigFile.class.php';
|
||||
|
||||
// use default error handler
|
||||
restore_error_handler();
|
||||
@@ -33,6 +33,20 @@ $GLOBALS['PMA_Config']->setCookie('pma_lang', $GLOBALS['lang']);
|
||||
if (!isset($_SESSION['ConfigFile'])) {
|
||||
$_SESSION['ConfigFile'] = array();
|
||||
}
|
||||
ConfigFile::getInstance()->setPersistKeys(array(
|
||||
'DefaultLang',
|
||||
'ServerDefault',
|
||||
'UploadDir',
|
||||
'SaveDir',
|
||||
'Servers/1/verbose',
|
||||
'Servers/1/host',
|
||||
'Servers/1/port',
|
||||
'Servers/1/socket',
|
||||
'Servers/1/extension',
|
||||
'Servers/1/connect_type',
|
||||
'Servers/1/auth_type',
|
||||
'Servers/1/user',
|
||||
'Servers/1/password'));
|
||||
|
||||
// allows for redirection even after sending some data
|
||||
ob_start();
|
||||
|
Reference in New Issue
Block a user