safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

reenable debug parameter

Browse Source 
The parameter got lost when switching to website settings.
Given that the use of a fixed parameter is limited,
debugging output can now only be set via the URL parameter.
This commit is contained in:
Sarah Hoffmann
2020-07-08 08:32:46 +02:00
parent 7ecfcf7eaa
commit d364afdf3b
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/website.tmpl
View File

@@ -1,3 +1,5 @@
<?php
@define('CONST_Debug', (isset($_GET['debug']) && $_GET['debug']));
require_once(dirname(dirname(__FILE__)).'/website/settings-frontend.php');
require_once(CONST_BasePath.'/@script_source@');

1
lib/setup/SetupClass.php
View File

@@ -707,7 +707,6 @@ class SetupFunctions
@define('CONST_BasePath', '".CONST_BasePath."');
if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
@define('CONST_Debug', ". (CONST_Debug? 'true' : 'false').");
@define('CONST_Database_DSN', '".CONST_Database_DSN."'); // or add ;host=...;port=...;user=...;password=...
@define('CONST_Default_Language', ".(CONST_Default_Language ? 'true' : 'false').");
@define('CONST_Default_Lat', ".CONST_Default_Lat.");

2
settings/defaults.php
View File

@@ -3,10 +3,8 @@
@define('CONST_InstallPath', '@CMAKE_BINARY_DIR@');
if (file_exists(getenv('NOMINATIM_SETTINGS'))) require_once(getenv('NOMINATIM_SETTINGS'));
if (file_exists(CONST_InstallPath.'/settings/local.php')) require_once(CONST_InstallPath.'/settings/local.php');
if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
// General settings
@define('CONST_Debug', false);
@define('CONST_Database_DSN', 'pgsql:dbname=nominatim'); // or add ;host=...;port=...;user=...;password=...
@define('CONST_Database_Web_User', 'www-data');
@define('CONST_Database_Module_Path', CONST_InstallPath.'/module');