mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-16 10:44:55 +02:00
Some features for docker users
Disable IP Check on install automatically fill out server_path
This commit is contained in:
@@ -195,7 +195,7 @@ if(is_writable(CACHE) && (MYAAC_OS != 'WINDOWS' || win_is_writable(CACHE))) {
|
||||
}
|
||||
}
|
||||
|
||||
if(!$allow)
|
||||
if(!$allow && !config('install_ignore_ip_check'))
|
||||
{
|
||||
$content = warning('In file <b>install/ip.txt</b> must be your IP!<br/>
|
||||
In file is:<br /><b>' . nl2br($file_content) . '</b><br/>
|
||||
|
@@ -11,6 +11,7 @@ foreach($config['clients'] as $client) {
|
||||
}
|
||||
|
||||
$twig->display('install.config.html.twig', array(
|
||||
'config' => $config,
|
||||
'clients' => $clients,
|
||||
'timezones' => DateTimeZone::listIdentifiers(),
|
||||
'locale' => $locale,
|
||||
|
@@ -37,6 +37,9 @@ if(!$error) {
|
||||
$configToSave['gzip_output'] = false;
|
||||
$configToSave['cache_engine'] = 'auto';
|
||||
$configToSave['cache_prefix'] = 'myaac_' . generateRandomString(8, true, false, true);
|
||||
if (isset($config['install_ignore_ip_check'])) {
|
||||
$configToSave['install_ignore_ip_check'] = $config['install_ignore_ip_check'];
|
||||
}
|
||||
|
||||
require BASE . 'install/includes/config.php';
|
||||
|
||||
@@ -84,7 +87,7 @@ if(!$error) {
|
||||
$_SESSION['config_content'] = $content;
|
||||
unset($_SESSION['saved']);
|
||||
|
||||
$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
|
||||
$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.local.php</b>', $locale['step_database_error_file']);
|
||||
error($locale['step_database_error_file'] . '<br/>
|
||||
<textarea cols="70" rows="10">' . $content . '</textarea>');
|
||||
}
|
||||
|
Reference in New Issue
Block a user